diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index 8a6438f..9ccf82e 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -1,7 +1,6 @@
-
-<!-- IMPORT partials/account_menu.tpl -->
-
 <div class="account">
+	<!-- IMPORT partials/account_menu.tpl -->
+	
 	<div class="row">
 		<div class="col-md-2 col-sm-4">
 			<div class="account-picture-block text-center">
diff --git a/templates/account/favourites.tpl b/templates/account/favourites.tpl
index 22babdf..038367e 100644
--- a/templates/account/favourites.tpl
+++ b/templates/account/favourites.tpl
@@ -1,18 +1,20 @@
-<!-- IMPORT partials/account_menu.tpl -->
+<div class="account">
+	<!-- IMPORT partials/account_menu.tpl -->
 
-<div class="favourites">
+	<div class="favourites">
 
-	<!-- IF !posts.length -->
-		<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
-	<!-- ENDIF !posts.length -->
+		<!-- IF !posts.length -->
+			<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
+		<!-- ENDIF !posts.length -->
 
-	<div class="row">
-		<div class="col-xs-12">
-			<!-- IMPORT partials/posts_list.tpl -->
+		<div class="row">
+			<div class="col-xs-12">
+				<!-- IMPORT partials/posts_list.tpl -->
 
-			<!-- IF config.usePagination -->
-				<!-- IMPORT partials/paginator.tpl -->
-			<!-- ENDIF config.usePagination -->
+				<!-- IF config.usePagination -->
+					<!-- IMPORT partials/paginator.tpl -->
+				<!-- ENDIF config.usePagination -->
+			</div>
 		</div>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/account/followers.tpl b/templates/account/followers.tpl
index 71d6477..051ed85 100644
--- a/templates/account/followers.tpl
+++ b/templates/account/followers.tpl
@@ -1,14 +1,15 @@
+<div class="account">
+	<!-- IMPORT partials/account_menu.tpl -->
 
-<!-- IMPORT partials/account_menu.tpl -->
+	<div class="users">
 
-<div class="users account">
+		<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
+			<!-- IMPORT partials/users_list.tpl -->
+		</ul>
 
-	<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
-		<!-- IMPORT partials/users_list.tpl -->
-	</ul>
-
-	<!-- IF !users.length -->
-	<div class="alert alert-warning">[[user:has_no_follower]]</div>
-	<!-- ENDIF !users.length -->
-</div>
+		<!-- IF !users.length -->
+		<div class="alert alert-warning">[[user:has_no_follower]]</div>
+		<!-- ENDIF !users.length -->
+	</div>
 
+</div>
\ No newline at end of file
diff --git a/templates/account/following.tpl b/templates/account/following.tpl
index 7cd78e5..4405195 100644
--- a/templates/account/following.tpl
+++ b/templates/account/following.tpl
@@ -1,13 +1,13 @@
-
-<!-- IMPORT partials/account_menu.tpl -->
-
-<div class="users account">
-	<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
-		<!-- IMPORT partials/users_list.tpl -->
-	</ul>
-
-	<!-- IF !users.length -->
-	<div class="alert alert-warning">[[user:follows_no_one]]</div>
-	<!-- ENDIF !users.length -->
-</div>
-
+<div class="account">
+	<!-- IMPORT partials/account_menu.tpl -->
+
+	<div class="users">
+		<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
+			<!-- IMPORT partials/users_list.tpl -->
+		</ul>
+
+		<!-- IF !users.length -->
+		<div class="alert alert-warning">[[user:follows_no_one]]</div>
+		<!-- ENDIF !users.length -->
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/account/posts.tpl b/templates/account/posts.tpl
index 0ba04ed..8990204 100644
--- a/templates/account/posts.tpl
+++ b/templates/account/posts.tpl
@@ -1,19 +1,20 @@
+<div class="account">
+	<!-- IMPORT partials/account_menu.tpl -->
 
-<!-- IMPORT partials/account_menu.tpl -->
+	<div class="favourites">
 
-<div class="favourites">
+		<!-- IF !posts.length -->
+		<div class="alert alert-warning">[[user:has_no_posts]]</div>
+		<!-- ENDIF !posts.length -->
 
-	<!-- IF !posts.length -->
-	<div class="alert alert-warning">[[user:has_no_posts]]</div>
-	<!-- ENDIF !posts.length -->
+		<div class="row">
+			<div class="col-xs-12">
+				<!-- IMPORT partials/posts_list.tpl -->
 
-	<div class="row">
-		<div class="col-xs-12">
-			<!-- IMPORT partials/posts_list.tpl -->
-
-			<!-- IF config.usePagination -->
-				<!-- IMPORT partials/paginator.tpl -->
-			<!-- ENDIF config.usePagination -->
+				<!-- IF config.usePagination -->
+					<!-- IMPORT partials/paginator.tpl -->
+				<!-- ENDIF config.usePagination -->
+			</div>
 		</div>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 5d1067b..41fdcb3 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -1,15 +1,6 @@
 <div class="account">
 	<!-- IMPORT partials/account_menu.tpl -->
 
-	<div class="cover" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
-		<div class="controls">
-			<span class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></span>
-			<span class="resize"><i class="fa fa-fw fa-4x fa-arrows-alt"></i></span>
-		</div>
-		<div class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></div>
-		<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
-	</div>
-
 	<div class="row">
 		<div class="col-md-5 account-block">
 
diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index 22e8539..f17ee24 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -1,6 +1,6 @@
-<!-- IMPORT partials/account_menu.tpl -->
-
 <div class="account">
+	<!-- IMPORT partials/account_menu.tpl -->
+	
 	<div class="row">
 		<div class="col-xs-12">
 			<!-- IF !disableCustomUserSkins -->
diff --git a/templates/account/topics.tpl b/templates/account/topics.tpl
index cb48b8e..2fa4edc 100644
--- a/templates/account/topics.tpl
+++ b/templates/account/topics.tpl
@@ -1,6 +1,6 @@
-<!-- IMPORT partials/account_menu.tpl -->
+<div class="account">
+	<!-- IMPORT partials/account_menu.tpl -->
 
-<div>
 	<!-- IF !topics.length -->
 		<div class="alert alert-warning">[[user:has_no_topics]]</div>
 	<!-- ENDIF !topics.length -->
diff --git a/templates/account/watched.tpl b/templates/account/watched.tpl
index 374c136..e8b6a02 100644
--- a/templates/account/watched.tpl
+++ b/templates/account/watched.tpl
@@ -1,6 +1,6 @@
-<!-- IMPORT partials/account_menu.tpl -->
+<div class="account">
+	<!-- IMPORT partials/account_menu.tpl -->
 
-<div>
 	<!-- IF !topics.length -->
 		<div class="alert alert-warning">[[user:has_no_watched_topics]]</div>
 	<!-- ENDIF !topics.length -->
@@ -11,4 +11,4 @@
 			<!-- IMPORT partials/paginator.tpl -->
 		<!-- ENDIF config.usePagination -->
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/partials/account_menu.tpl b/templates/partials/account_menu.tpl
index 4116fb5..b57a7de 100644
--- a/templates/partials/account_menu.tpl
+++ b/templates/partials/account_menu.tpl
@@ -33,4 +33,13 @@
 		<li><a href="{config.relative_path}/user/{userslug}/edit"><i class="fa fa-pencil-square-o"></i> [[user:edit]]</a></li>
 		<!-- ENDIF showHidden -->
 	</ul>
+</div>
+
+<div class="cover" component="account/cover" style="background-image: url({cover:url}); background-position: {cover:position};">
+	<div class="controls">
+		<span class="upload"><i class="fa fa-fw fa-4x fa-upload"></i></span>
+		<span class="resize"><i class="fa fa-fw fa-4x fa-arrows-alt"></i></span>
+	</div>
+	<div class="save">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></div>
+	<div class="indicator">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>
 </div>
\ No newline at end of file