diff --git a/public/css/style.less b/public/css/style.less
index 34b74dc9fe..df3a249ede 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -207,11 +207,6 @@ footer.footer {
    margin-bottom:10px;
 }
 
-.user-8080-picture {
-   width:80px;
-   height:80px;
-}
-
 .user-picture-label {
   font-size:20px;
 }
@@ -333,14 +328,22 @@ footer.footer {
 
 .users-box{
   display: inline-block;
-  margin-right: 20px;
   margin-top: 20px;
   text-align: center; 
   vertical-align: top; 
-  max-width: 84px;
+  max-width: 104px;
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
+
+  img {
+  	width:80px;
+  	height:80px;
+  }
+
+  a {
+  	margin:5px;
+  }
 }
 
 a:hover {
diff --git a/public/templates/admin/users.tpl b/public/templates/admin/users.tpl
index 1f9bc8af8a..e0c6e4bc0f 100644
--- a/public/templates/admin/users.tpl
+++ b/public/templates/admin/users.tpl
@@ -16,9 +16,9 @@
 
 <ul class="users">
 	<!-- BEGIN users -->
-	<div class="users-box well" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}">
+	<div class="users-box" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}">
 		<a href="/users/{users.userslug}">
-			<img src="{users.picture}" class="user-8080-picture"/>
+			<img src="{users.picture}" class="img-polaroid"/>
 		</a>
 		<br/>
 		<a href="/users/{users.userslug}">{users.username}</a>
@@ -34,7 +34,6 @@
 		<div>
 			<a href="#" class="btn admin-btn">Admin</a>
 		</div>
-		<br/>
 		<div>
 			<a href="#" class="btn delete-btn btn-danger">Delete</a>
 		</div>
diff --git a/public/templates/followers.tpl b/public/templates/followers.tpl
index 14152f7ed9..139a14dd56 100644
--- a/public/templates/followers.tpl
+++ b/public/templates/followers.tpl
@@ -15,10 +15,9 @@
 
 	<div>
 		<!-- BEGIN followers -->
-
-		<div class="users-box well">
+		<div class="users-box">
 			<a href="/users/{followers.userslug}">
-				<img src="{followers.picture}" class="user-8080-picture"/>
+				<img src="{followers.picture}" class="img-polaroid"/>
 			</a>
 			<br/>
 			<a href="/users/{followers.userslug}">{followers.username}</a>
diff --git a/public/templates/following.tpl b/public/templates/following.tpl
index ff550d0cc2..a167182c8c 100644
--- a/public/templates/following.tpl
+++ b/public/templates/following.tpl
@@ -18,9 +18,9 @@
 	<div>
 		<!-- BEGIN following -->
 
-		<div class="users-box well">
+		<div class="users-box">
 			<a href="/users/{following.userslug}">
-				<img src="{following.picture}" class="user-8080-picture"/>
+				<img src="{following.picture}" class="img-polaroid"/>
 			</a>
 			<br/>
 			<a href="/users/{following.userslug}">{following.username}</a>
diff --git a/public/templates/users.tpl b/public/templates/users.tpl
index 2bc1ade407..8f6da1c8b2 100644
--- a/public/templates/users.tpl
+++ b/public/templates/users.tpl
@@ -16,9 +16,9 @@
 	
 	<ul class="users">
 		<!-- BEGIN users -->
-		<div class="users-box well">
+		<div class="users-box">
 			<a href="/users/{users.userslug}">
-				<img src="{users.picture}" class="user-8080-picture"/>
+				<img src="{users.picture}" class="img-polaroid"/>
 			</a>
 			<br/>
 			<a href="/users/{users.userslug}">{users.username}</a>