diff --git a/public/css/style.less b/public/css/style.less
index fb6aabd698..580b9f74d0 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -807,7 +807,18 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 
 }
 
+.account {
+	.topic-row {
+		width: 100%;
+	}
+}
 
+.favourites {
+	.topic-row {
+		width: 100%;
+		margin-bottom: 10px;
+	}
+}
 
 //topic
 .category-list {
diff --git a/public/templates/403.tpl b/public/templates/403.tpl
index 4cbd7e91dc..62b460deb3 100644
--- a/public/templates/403.tpl
+++ b/public/templates/403.tpl
@@ -1,4 +1,4 @@
-<div class="alert alert-error">
+<div class="alert alert-danger">
 	<strong>Access Denied</strong>
 	<p>You seem to have stumbled upon a page that you do not have access to. Perhaps you should <a href="/login">try logging in?</a></p>
 </div>
\ No newline at end of file
diff --git a/public/templates/404.tpl b/public/templates/404.tpl
index f3a998992e..1825280f6f 100644
--- a/public/templates/404.tpl
+++ b/public/templates/404.tpl
@@ -1,4 +1,4 @@
-<div class="alert alert-error">
+<div class="alert alert-danger">
 	<strong>Not found</strong>
 	<p>You seem to have stumbled upon a page that does not exist. Return to the <a href="/">home page</a></p>
 </div>
\ No newline at end of file
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 6ad5660ccb..16e87313c6 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -1,5 +1,5 @@
 
-<div class="well">
+<div class="well account">
 
 	<div class="account-username-box" data-userslug="{userslug}">
 		<span class="account-username">
@@ -8,7 +8,7 @@
 	</div>
 
 	<div class="row">
-		<div class="span2 account-block" style="text-align: center; margin-bottom:20px;">
+		<div class="col-md-2 account-block" style="text-align: center; margin-bottom:20px;">
 			<div class="account-picture-block">
 				<img src="{picture}" class="user-profile-picture img-thumbnail"/>
 			</div>
@@ -24,7 +24,7 @@
 			</div>
 		</div>
 
-		<div class="span4">
+		<div class="col-md-4">
 			<div class="inline-block">
 				<div class="account-bio-block">
 					<span class="account-bio-label">email</span><i class="icon-eye-close {emailClass}" title="Email hidden"></i>
@@ -80,7 +80,7 @@
 			</div>
 		</div>
 
-		<div class="span6 user-recent-posts">
+		<div class="col-md-6 user-recent-posts">
 			<!-- BEGIN posts -->
 			<div class="topic-row img-thumbnail clearfix" topic-url="topic/{posts.tid}/#{posts.pid}">
 				<span>{posts.content}</span>
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 1edeff2baa..5ded9d8b49 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -21,9 +21,9 @@
 				<span class="user-picture-label">Uploaded picture</span>
 				<i class='icon-ok icon-2x'></i>
 			</div>
-		
+
 			<a id="uploadPictureBtn" href="#">Upload new picture</a>
-		
+
 		</div>
 
 		<div class="modal-footer">
@@ -39,27 +39,27 @@
 			<h3 id="myModalLabel">Upload Picture</h3>
 		</div>
 		<div class="modal-body">
-			
+
 			<form id="uploadForm" action="{relative_path}/users/uploadpicture" method="post" enctype="multipart/form-data">
 				<input id="userPhotoInput" type="file" name="userPhoto" />
 				<input id="imageUploadCsrf" type="hidden" name="_csrf" value="" />
 			</form>
-			
+
 			<div id="upload-progress-box" class="progress progress-striped active hide">
 				<div id="upload-progress-bar" class="bar" style="width: 0%;"></div>
 			</div>
-			
+
 			<div id="alert-status" class="alert hide"></div>
 			<div id="alert-success" class="alert alert-success hide"></div>
 			<div id="alert-error" class="alert alert-error hide"></div>
-	
+
 		</div>
 		<div class="modal-footer">
 			<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
 			<button id="pictureUploadSubmitBtn" class="btn btn-primary">Upload Picture</button>
 		</div>
 	</div>
-	
+
 	<div class="account-username-box" data-userslug="{userslug}">
 		<span class="account-username">
 			<a href="/users/{userslug}">{username}</a> <i class="icon-chevron-right"></i>
@@ -68,98 +68,99 @@
 	</div>
 
 	<div class="row">
-		<div class="span2" style="text-align: center; margin-bottom:20px;">
+		<div class="col-md-2" style="text-align: center; margin-bottom:20px;">
 			<div class="account-picture-block text-center">
 				<img id="user-current-picture" class="user-profile-picture img-thumbnail" src="{picture}" /><br/>
 				<a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a>
 			</div>
 		</div>
-		  
-		<div class="span10">
-			 <div class="inline-block">
+
+		<div class="col-md-10">
+			 <div>
 				<form class='form-horizontal'>
 					<div class="control-group">
 						<label class="control-label" for="inputEmail">Email</label>
 						<div class="controls">
-							<input type="text" id="inputEmail" placeholder="Email" value="{email}">
+							<input class="form-control" type="text" id="inputEmail" placeholder="Email" value="{email}">
 						</div>
 					</div>
-				
+
 					<div class="control-group">
 						<label class="control-label" for="inputFullname">Full Name</label>
 						<div class="controls">
-							<input type="text" id="inputFullname" placeholder="Full Name" value="{fullname}">
+							<input class="form-control" type="text" id="inputFullname" placeholder="Full Name" value="{fullname}">
 						</div>
 					</div>
-				
+
 					<div class="control-group">
 						<label class="control-label" for="inputWebsite">Website</label>
 						<div class="controls">
-							<input type="text" id="inputWebsite" placeholder="http://website.com" value="{website}">
+							<input class="form-control" type="text" id="inputWebsite" placeholder="http://website.com" value="{website}">
 						</div>
 					</div>
-				 
+
 					<div class="control-group">
 						<label class="control-label" for="inputLocation">Location</label>
 						<div class="controls">
-							<input type="text" id="inputLocation" placeholder="Location" value="{location}">
+							<input class="form-control" type="text" id="inputLocation" placeholder="Location" value="{location}">
 						</div>
 					</div>
-				  
+
 					<div class="control-group">
 						<label class="control-label" for="inputBirthday">Birthday</label>
 						<div class="controls">
-							<input type="date" id="inputBirthday" placeholder="mm/dd/yyyy" value="{birthday}">
+							<input class="form-control" type="date" id="inputBirthday" placeholder="mm/dd/yyyy" value="{birthday}">
 						</div>
 					</div>
 
 					<div class="control-group">
 						<label class="control-label" for="inputSignature">Signature</label>
 						<div class="controls">
-							<textarea id="inputSignature" placeholder="max 150 chars" rows="5">{signature}</textarea>
+							<textarea class="form-control" id="inputSignature" placeholder="max 150 chars" rows="5">{signature}</textarea>
 						</div>
 					</div>
-				 
-					<input type="hidden" id="inputUID" value="{uid}">
-				 
+
+					<input type="hidden" id="inputUID" value="{uid}"><br />
+
 					<div class="form-actions">
 						<a id="submitBtn" href="#" class="btn btn-primary">Save changes</a>
 					</div>
-				  
+
 				</form>
 			</div>
-			<div class="inline-block" style="vertical-align:top;">
+			<hr />
+			<div style="vertical-align:top;">
 				<form class='form-horizontal'>
 					<div class="control-group">
 						<label class="control-label" for="inputCurrentPassword">Current Password</label>
 						<div class="controls">
-							<input type="password" id="inputCurrentPassword" placeholder="Current Password" value="">
+							<input class="form-control" type="password" id="inputCurrentPassword" placeholder="Current Password" value="">
 						</div>
 					</div>
-				
+
 					<div class="control-group">
 						<label class="control-label" for="inputNewPassword">Password</label>
 						<div class="controls">
-							<input type="password" id="inputNewPassword" placeholder="New Password" value=""><br/><span id="password-notify" class="label label-danger"></span>
+							<input class="form-control" type="password" id="inputNewPassword" placeholder="New Password" value=""><span id="password-notify" class="label label-danger"></span>
 						</div>
 					</div>
-				
+
 					<div class="control-group">
 						<label class="control-label" for="inputNewPasswordAgain">Confirm Password</label>
 						<div class="controls">
-							<input type="password" id="inputNewPasswordAgain" placeholder="Confirm Password" value=""><br/><span id="password-confirm-notify" class="label label-danger"></span>
+							<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="Confirm Password" value=""><br/><span id="password-confirm-notify" class="label label-danger"></span>
 						</div>
 					</div>
-				
+
 					<div class="form-actions">
 						<a id="changePasswordBtn" href="#" class="btn btn-primary">Change Password</a>
 					</div>
-				
+
 				</form>
 			</div>
 		</div>
-		
-	</div>  
+
+	</div>
 </div>
 
 <input type="hidden" template-variable="gravatarpicture" value="{gravatarpicture}" />
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl
index b65c515f17..5cc28d198d 100644
--- a/public/templates/accountsettings.tpl
+++ b/public/templates/accountsettings.tpl
@@ -1,6 +1,6 @@
 
 <div class="well">
-	
+
 	<div class="account-username-box" data-userslug="{userslug}">
 		<span class="account-username">
 			<a href="/users/{userslug}">{username}</a> <i class="icon-chevron-right"></i>
@@ -9,17 +9,19 @@
 	</div>
 
 	<div class="row">
-		<div class="span6">
+		<div class="col-md-6">
 			<h4>privacy</h4>
-			<label class="checkbox">
-      			<input id="showemailCheckBox" type="checkbox" {showemail}> Show my email
-    		</label>
+			<div class="checkbox">
+				<label>
+	      			<input id="showemailCheckBox" type="checkbox" {showemail}> Show my email
+	    		</label>
+	    	</div>
 		</div>
-		  
-		<div class="span6">
-			
+
+		<div class="col-md-6">
+
 		</div>
-	</div>  
+	</div>
 	<div class="form-actions">
 		<a id="submitBtn" href="#" class="btn btn-primary">Save changes</a>
 	</div>
diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl
index b91c1393d0..15fe4c9696 100644
--- a/public/templates/favourites.tpl
+++ b/public/templates/favourites.tpl
@@ -1,5 +1,5 @@
 
-<div class="well">
+<div class="well favourites">