diff --git a/public/css/style.less b/public/css/style.less
index b69e553d9f..c691b9f14b 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -199,7 +199,6 @@ footer.footer {
 
 .account-picture-block{
     display:inline-block;
-    margin-right:20px;
     vertical-align:top;
 }
  
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index ce3cdf29bc..5386e0a534 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -16,13 +16,16 @@
 		
 
 	<div class="row-fluid">
-		<div class="span3" style="text-align: center; margin-bottom:20px;">
+		<div class="span2" style="text-align: center; margin-bottom:20px;">
 			<div class="account-picture-block">
 				<img src="{picture}" class="user-profile-picture"/>
 			</div>
+			<div id="user-actions">
+				<a id="follow-btn" href="#" class="btn">Follow</a>
+			</div>
 		</div>
 	
-		<div class="span9">
+		<div class="span10">
 			<div class="inline-block">
 				<div class="account-bio-block">
 					<span class="account-bio-label">email</span>
@@ -74,9 +77,7 @@
 			</div>
 		</div>
 	</div>
-	<div id="user-actions" class="container">
-		<a id="follow-btn" href="#" class="btn">Follow</a>
-	</div>
+
 	<br/>
 	<div id="user-action-alert" class="alert alert-success hide"></div>
 
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 29eca0aa32..758c0c8cf2 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -73,14 +73,14 @@
 	</div>
 
 	<div class="row-fluid">
-		<div class="span3" style="text-align: center; margin-bottom:20px;">
+		<div class="span2" style="text-align: center; margin-bottom:20px;">
 			<div class="account-picture-block text-center">
 				<img id="user-current-picture" class="user-profile-picture" src="{picture}" /><br/>
 				<a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a>
 			</div>
 		</div>
 		  
-		<div class="span9">
+		<div class="span10">
 			 <div class="inline-block">
 				<form class='form-horizontal'>
 					<div class="control-group">