diff --git a/public/src/forum/accountheader.js b/public/src/forum/accountheader.js
index 291d25e050..ec9a6ac2e7 100644
--- a/public/src/forum/accountheader.js
+++ b/public/src/forum/accountheader.js
@@ -14,7 +14,7 @@ define(function() {
 	AccountHeader.createMenu = function() {
 		var userslug = $('.account-username-box').attr('data-userslug');
 
-		var html ='<ul class="nav nav-tabs account-sub-links">\
+		var html ='<ul class="nav nav-pills account-sub-links">\
 					<li id="settingsLink"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/settings">[[user:settings]]</a></li>\
 					<li id="favouritesLink"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/favourites">[[user:favourites]]</a></li>\
 					<li><a href="' + RELATIVE_PATH + '/user/' + userslug + '/posts">[[global:posts]]</a></li>\
diff --git a/public/src/forum/accountposts.js b/public/src/forum/accountposts.js
index 76b2991b88..7ca5c37ee9 100644
--- a/public/src/forum/accountposts.js
+++ b/public/src/forum/accountposts.js
@@ -5,6 +5,8 @@ define(['forum/accountheader'], function(header) {
 	AccountPosts.init = function() {
 		header.init();
 
+		$('.user-favourite-posts img').addClass('img-responsive');
+
 		app.enableInfiniteLoading(function() {
 			if(!loadingMore) {
 				loadMore();
@@ -41,6 +43,7 @@ define(['forum/accountheader'], function(header) {
 			$('#category-no-topics').remove();
 
 			html = $(translatedHTML);
+			html.find('img').addClass('img-responsive');
 			$('.user-favourite-posts').append(html);
 			$('span.timeago').timeago();
 			app.createUserTooltips();
diff --git a/public/src/forum/favourites.js b/public/src/forum/favourites.js
index 4cce3508f9..81fe7fda5e 100644
--- a/public/src/forum/favourites.js
+++ b/public/src/forum/favourites.js
@@ -5,6 +5,8 @@ define(['forum/accountheader'], function(header) {
 	Favourites.init = function() {
 		header.init();
 
+		$('.user-favourite-posts img').addClass('img-responsive');
+
 		app.enableInfiniteLoading(function() {
 			if(!loadingMore) {
 				loadMore();
@@ -40,6 +42,7 @@ define(['forum/accountheader'], function(header) {
 			$('#category-no-topics').remove();
 
 			html = $(translatedHTML);
+			html.find('img').addClass('img-responsive');
 			$('.user-favourite-posts').append(html);
 			$('span.timeago').timeago();
 			app.createUserTooltips();
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 6d0e9a87c0..565bccd649 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -2,7 +2,7 @@
 
 </div>
 
-<div class="well account">
+<div class="account">
 
 	<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true">
 		<div class="modal-dialog">
@@ -106,7 +106,7 @@
 				</form>
 			</div>
 
-			<hr/>
+			<hr class="visible-xs visible-sm"/>
 		</div>
 
 		<div class="col-md-5">
diff --git a/public/templates/accountposts.tpl b/public/templates/accountposts.tpl
index f1348cbba0..19744217d1 100644
--- a/public/templates/accountposts.tpl
+++ b/public/templates/accountposts.tpl
@@ -2,7 +2,7 @@
 
 </div>
 
-<div class="well favourites">
+<div class="favourites">
 
 	<!-- IF !posts.length -->
 		<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl
index 89ad7e803f..3e8f592d5e 100644
--- a/public/templates/accountsettings.tpl
+++ b/public/templates/accountsettings.tpl
@@ -2,7 +2,7 @@
 
 </div>
 
-<div class="well account">
+<div class="account">
 
 	<div class="row">
 		<div class="col-md-6">
diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl
index e5e267a6cd..fd0c175ba7 100644
--- a/public/templates/favourites.tpl
+++ b/public/templates/favourites.tpl
@@ -2,7 +2,7 @@
 
 </div>
 
-<div class="well favourites">
+<div class="favourites">
 
 	<!-- IF !posts.length -->
 		<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
diff --git a/public/templates/followers.tpl b/public/templates/followers.tpl
index 8ae976c41d..8c66beb9cd 100644
--- a/public/templates/followers.tpl
+++ b/public/templates/followers.tpl
@@ -2,13 +2,11 @@
 
 </div>
 
-<div class="well users account">
+<div class="users account">
 	<div>
 		<!-- BEGIN followers -->
 		<div class="users-box">
-			<a href="../../user/{followers.userslug}">
-				<img src="{followers.picture}" class="img-thumbnail"/>
-			</a>
+			<a href="../../user/{followers.userslug}"><img src="{followers.picture}" class="img-thumbnail"/></a>
 			<br/>
 			<div class="user-info">
 				<a href="../../user/{followers.userslug}">{followers.username}</a>
diff --git a/public/templates/following.tpl b/public/templates/following.tpl
index 541e3543d3..31d858fbb5 100644
--- a/public/templates/following.tpl
+++ b/public/templates/following.tpl
@@ -2,13 +2,11 @@
 
 </div>
 
-<div class="well users account">
+<div class="users account">
 	<div>
 		<!-- BEGIN following -->
 		<div class="users-box">
-			<a href="../../user/{following.userslug}">
-				<img src="{following.picture}" class="img-thumbnail"/>
-			</a>
+			<a href="../../user/{following.userslug}"><img src="{following.picture}" class="img-thumbnail"/></a>
 			<br/>
 			<div class="user-info">
 				<a href="../../user/{following.userslug}">{following.username}</a>