diff --git a/app/templates/users/user_profile_page.html b/app/templates/users/user_profile_page.html
index a24587c4..f0f7ab09 100644
--- a/app/templates/users/user_profile_page.html
+++ b/app/templates/users/user_profile_page.html
@@ -19,77 +19,77 @@
 	<div class="col-sm-6">
 		<div class="card">
 			<h2 class="card-header">{{ user.display_name }}</h2>
-			<table class="table">
-				<tr>
-					<td>Rank:</td>
-					<td>
-						{{ user.rank.getTitle() }}
-					</td>
-				</tr>
-				<tr>
-					<td>Accounts:</td>
-					<td>
-						{% if user.forums_username %}
-							<a href="https://forum.minetest.net/memberlist.php?mode=viewprofile&un={{ user.forums_username }}">
-								Minetest Forum
-							</a>
-						{% elif user == current_user %}
-							No forum account
-						{% endif %}
+			<div class="card-body row">
+				<div class="col-md-2">
+					{% if user.email %}
+						<a class="btn btn-primary" href="https://en.gravatar.com/">
+					{% endif %}
+					<img class="img-responsive user-photo img-thumbnail  img-thumbnail-1" src="{{ (user.email or '') | gravatar }}">
+					{% if user.email %}
+						</a>
+					{% endif %}
+				</div>
+				<div class="col">
+					<table class="table">
+						<tr>
+							<td>Rank:</td>
+							<td>
+								{{ user.rank.getTitle() }}
+							</td>
+						</tr>
+						<tr>
+							<td>Accounts:</td>
+							<td>
+								{% if user.forums_username %}
+									<a href="https://forum.minetest.net/memberlist.php?mode=viewprofile&un={{ user.forums_username }}">
+										Minetest Forum
+									</a>
+								{% elif user == current_user %}
+									No forum account
+								{% endif %}
 
-						{% if (user.forums_username and user.github_username) or user == current_user %}
-							|
-						{% endif %}
+								{% if (user.forums_username and user.github_username) or user == current_user %}
+									|
+								{% endif %}
 
-						{% if user.github_username %}
-							<a href="https://github.com/{{ user.github_username }}">GitHub</a>
-						{% elif user == current_user %}
-							<a href="{{ url_for('github_signin_page') }}">Link Github</a>
-						{% endif %}
+								{% if user.github_username %}
+									<a href="https://github.com/{{ user.github_username }}">GitHub</a>
+								{% elif user == current_user %}
+									<a href="{{ url_for('github_signin_page') }}">Link Github</a>
+								{% endif %}
 
+								{% if user == current_user %}
+									&#x1f30e;
+								{% endif %}
+							</td>
+						</tr>
 						{% if user == current_user %}
-							&#x1f30e;
+							<tr>
+								<td>Profile Picture:</td>
+								<td>
+									{% if user.email %}
+										<a class="btn btn-primary" href="https://en.gravatar.com/">
+											Gravatar
+										</a>
+									{% else %}
+										<p>
+											Please add an email to your profile.
+										</p>
+									{% endif %}
+								</td>
+							</tr>
+							<tr>
+								<td>Password:</td>
+								<td>
+									{% if user.password %}
+										Set | <a href="{{ url_for('user.change_password') }}">Change</a>
+									{% else %}
+										Not set | <a href="{{ url_for('set_password_page') }}">Set</a>
+									{% endif %}
+								</td>
+							</tr>
 						{% endif %}
-					</td>
-				</tr>
-				{% if user == current_user %}
-					<tr>
-						<td>Password:</td>
-						<td>
-							{% if user.password %}
-								Set | <a href="{{ url_for('user.change_password') }}">Change</a>
-							{% else %}
-								Not set | <a href="{{ url_for('set_password_page') }}">Set</a>
-							{% endif %}
-						</td>
-					</tr>
-				{% endif %}
-			</table>
-		</div>
-
-		<div class="row mt-4">
-			<div class="col-md-2">
-				<img class="img-responsive user-photo img-thumbnail  img-thumbnail-1" src="{{ (user.email or '') | gravatar }}">
-			</div>
-			<div class="col">
-				<div class="card">
-					<div class="card-header">
-						Profile Picture
-					</div>
-					<div class="card-body">
-						<p>ContentDB uses Gravatar for profile pictures</p>
-						{% if user == current_user %}
-							{% if user.email %}
-								<a class="btn btn-primary" href="https://en.gravatar.com/">
-									Gravatar
-								</a>
-							{% else %}
-								<p>
-									Please add an email to your profile.
-								</p>
-							{% endif %}
-						{% endif %}
-					</div>
+					</table>
 				</div>
 			</div>
 		</div>
@@ -135,7 +135,7 @@
 
 		<p class="card-body">
 			List of your forum topics which do not have a matching package.
-			Topics with a strikethrough have beened marked as discarded.
+			Topics with a strikethrough have been marked as discarded.
 		</p>
 
 		{% from "macros/topics.html" import render_topics_table %}