diff --git a/app/scss/components.scss b/app/scss/components.scss
index da7ca636..5d30c07b 100644
--- a/app/scss/components.scss
+++ b/app/scss/components.scss
@@ -32,7 +32,7 @@ a:hover {
 }
 
 .box .box-body {
-	padding: 1em;
+	padding: 1em !important;
 }
 
 // .box form {
diff --git a/app/templates/flask_user/login.html b/app/templates/flask_user/login.html
index 24ea95ec..29f457d0 100644
--- a/app/templates/flask_user/login.html
+++ b/app/templates/flask_user/login.html
@@ -10,7 +10,7 @@ Sign in
 		{% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %}
 		<h2>{%trans%}Sign in{%endtrans%}</h2>
 
-		<form action="" method="POST" class="form" role="form" class="box-body">
+		<form action="" method="POST" class="form box-body" role="form">
 			<a href="{{ url_for('github_signin_page') }}">GitHub</a>
 
 
@@ -46,25 +46,24 @@ Sign in
 						<a href="{{ url_for('user.forgot_password') }}" tabindex='195'>
 							{%trans%}Forgot your Password?{%endtrans%}</a>
 							{% endif %}
-						</div>
 					</div>
-					{{ field(class_='form-control', tabindex=120) }}
-					{% if field.errors %}
-					{% for e in field.errors %}
-					<p class="help-block">{{ e }}</p>
-					{% endfor %}
-					{% endif %}
 				</div>
-
-				{# Remember me #}
-				{% if user_manager.enable_remember_me %}
-				{{ render_checkbox_field(login_form.remember_me, tabindex=130) }}
+				{{ field(class_='form-control', tabindex=120) }}
+				{% if field.errors %}
+				{% for e in field.errors %}
+				<p class="help-block">{{ e }}</p>
+				{% endfor %}
 				{% endif %}
+			</div>
 
-				{# Submit button #}
-				{{ render_submit_field(form.submit, tabindex=180) }}
-			</form>
+			{# Remember me #}
+			{% if user_manager.enable_remember_me %}
+			{{ render_checkbox_field(login_form.remember_me, tabindex=130) }}
+			{% endif %}
 
+			{# Submit button #}
+			{{ render_submit_field(form.submit, tabindex=180) }}
+		</form>
 	</div>
 
 	<div class="right">
diff --git a/app/templates/flask_user/public_base.html b/app/templates/flask_user/public_base.html
index 3db49fe0..60cafeed 100644
--- a/app/templates/flask_user/public_base.html
+++ b/app/templates/flask_user/public_base.html
@@ -3,6 +3,7 @@
 {% block container %}
 	<main>
 		<div class="box box_grey">
+			<!-- <h2>{{ self.title() }}</h2> -->
 			<div class="box-body">
 				{% block content %}
 				{% endblock %}
diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html
index 150abee0..565c4d33 100644
--- a/app/templates/packages/view.html
+++ b/app/templates/packages/view.html
@@ -40,45 +40,48 @@
 	</ul>
 
 	<aside class="asideright box box_grey">
-		<table>
-			<tr>
-				<td>Name</td>
-				<td>{{ package.name }}</td>
-			</tr>
-			<tr>
-				<td>Author</td>
-				<td class="{{ package.author.rank }}">
-					<a href="{{ url_for('user_profile_page', username=package.author.username) }}">
-						{{ package.author.display_name }}
-					</a>
-				</td>
-			</tr>
-			<tr>
-				<td>Type</td>
-				<td>{{ package.type.value }}</td>
-			</tr>
-			<tr>
-				<td>License</td>
-				<td>{{ package.license.name }}</td>
-			</tr>
-		</table>
+		<h3>Details</h3>
+		<div class="box-body">
+			<table>
+				<tr>
+					<td>Name</td>
+					<td>{{ package.name }}</td>
+				</tr>
+				<tr>
+					<td>Author</td>
+					<td class="{{ package.author.rank }}">
+						<a href="{{ url_for('user_profile_page', username=package.author.username) }}">
+							{{ package.author.display_name }}
+						</a>
+					</td>
+				</tr>
+				<tr>
+					<td>Type</td>
+					<td>{{ package.type.value }}</td>
+				</tr>
+				<tr>
+					<td>License</td>
+					<td>{{ package.license.name }}</td>
+				</tr>
+			</table>
 
-		<ul class="buttonset linedbuttonset">
-			{% if package.getDownloadRelease() %}<li><a href="{{ package.getDownloadURL() }}">Download</a></li>{% endif %}
-			{% if package.repo %}<li><a href="{{ package.repo }}">View Source</a></li>{% endif %}
-			{% if package.forums %}<li><a href="https://forum.minetest.net/viewtopic.php?t={{ package.forums }}">Forums</a></li>{% endif %}
-			{% if package.issueTracker %}<li><a href="{{ package.issueTracker }}">Issue Tracker</a></li>{% endif %}
-			{% if package.website %}<li><a href="{{ package.website }}">Website</a></li>{% endif %}
-			{% if package.checkPerm(current_user, "EDIT_PACKAGE") %}
-				<li><a href="{{ package.getEditURL() }}">Edit</a></li>
-				<li><a href="{{ package.getNewScreenshotURL() }}">Add screenshot</a></li>
-			{% elif current_user.is_authenticated %}
-				<li><a href="{{ package.getCreateEditRequestURL() }}">Suggest Change</a></li>
-			{% endif %}
-			{% if package.checkPerm(current_user, "MAKE_RELEASE") %}
-				<li><a href="{{ package.getCreateReleaseURL() }}">Create Release</a></li>
-			{% endif %}
-		</ul>
+			<ul class="buttonset linedbuttonset">
+				{% if package.getDownloadRelease() %}<li><a href="{{ package.getDownloadURL() }}">Download</a></li>{% endif %}
+				{% if package.repo %}<li><a href="{{ package.repo }}">View Source</a></li>{% endif %}
+				{% if package.forums %}<li><a href="https://forum.minetest.net/viewtopic.php?t={{ package.forums }}">Forums</a></li>{% endif %}
+				{% if package.issueTracker %}<li><a href="{{ package.issueTracker }}">Issue Tracker</a></li>{% endif %}
+				{% if package.website %}<li><a href="{{ package.website }}">Website</a></li>{% endif %}
+				{% if package.checkPerm(current_user, "EDIT_PACKAGE") %}
+					<li><a href="{{ package.getEditURL() }}">Edit</a></li>
+					<li><a href="{{ package.getNewScreenshotURL() }}">Add screenshot</a></li>
+				{% elif current_user.is_authenticated %}
+					<li><a href="{{ package.getCreateEditRequestURL() }}">Suggest Change</a></li>
+				{% endif %}
+				{% if package.checkPerm(current_user, "MAKE_RELEASE") %}
+					<li><a href="{{ package.getCreateReleaseURL() }}">Create Release</a></li>
+				{% endif %}
+			</ul>
+		</div>
 	</aside>
 
 	<p class="package-short-large">{{ package.shortDesc }}</p>
diff --git a/app/templates/users/user_profile_page.html b/app/templates/users/user_profile_page.html
index e4f9ff01..e5bd127d 100644
--- a/app/templates/users/user_profile_page.html
+++ b/app/templates/users/user_profile_page.html
@@ -9,7 +9,7 @@
 <div class="box box_grey">
 	<h2>{{ user.display_name }}</h2>
 
-	<table>
+	<table class="box-body">
 		<tr>
 			<td>Rank:</td>
 			<td>
@@ -47,20 +47,22 @@
 
 <div class="box box_grey">
 	<h2>Packages</h2>
-	<ul>
-		{% for p in user.packages %}
-			<li><a href="{{ p.getDetailsURL() }}">
-				{{ p.title }} by {{ p.author.display_name }}
-			</a></li>
-		{% else %}
-			<li><i>No packages available</i></ul>
-		{% endfor %}
-	</ul>
-	{% if user == current_user or user.checkPerm(current_user, "CHANGE_AUTHOR") %}
-		<p><a class="button" href="{{ url_for('create_edit_package_page', author=user.username) }}">
-			Create
-		</a></p>
-	{% endif %}
+	<div class="box-body">
+		<ul>
+			{% for p in user.packages %}
+				<li><a href="{{ p.getDetailsURL() }}">
+					{{ p.title }} by {{ p.author.display_name }}
+				</a></li>
+			{% else %}
+				<li><i>No packages available</i></ul>
+			{% endfor %}
+		</ul>
+		{% if user == current_user or user.checkPerm(current_user, "CHANGE_AUTHOR") %}
+			<p><a class="button" href="{{ url_for('create_edit_package_page', author=user.username) }}">
+				Create
+			</a></p>
+		{% endif %}
+	</div>
 </div>
 
 {% if form %}
@@ -68,7 +70,7 @@
 	<div class="box box_grey">
 		<h2>Edit Details</h2>
 
-		<form action="" method="POST" class="form" role="form">
+		<form action="" method="POST" class="form box-body" role="form">
 			<div class="row">
 				<div class="col-sm-6 col-md-5 col-lg-4">
 					{{ form.hidden_tag() }}