diff --git a/app/assets/javascripts/admin/templates/site_settings.js.handlebars b/app/assets/javascripts/admin/templates/site_settings.js.handlebars
index 8016088b0..ac24d5128 100644
--- a/app/assets/javascripts/admin/templates/site_settings.js.handlebars
+++ b/app/assets/javascripts/admin/templates/site_settings.js.handlebars
@@ -1,11 +1,11 @@
 <div class='admin-controls'>
-  <div class='span15 search controls'>
+  <div class='search controls'>
   <label>
     {{view Ember.Checkbox checkedBinding="controller.onlyOverridden"}}
     {{i18n admin.site_settings.show_overriden}}
   </label>
   </div>
-  <div class='span5 controls'>
+  <div class='search controls'>
     {{view Discourse.TextField valueBinding="controller.filter" placeholderKey="type_to_filter"}}
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars
index 7da213cc5..32d347c8d 100644
--- a/app/assets/javascripts/admin/templates/users_list.js.handlebars
+++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars
@@ -7,7 +7,7 @@
         <li>{{#linkTo adminUsersList.pending}}{{i18n admin.users.pending}}{{/linkTo}}</li>
       {{/if}}
     </ul>
-  </div>  
+  </div>
   <div class='span5 username controls'>
     {{view Discourse.TextField valueBinding="controller.username" placeholderKey="username"}}
   </div>
@@ -20,7 +20,7 @@
 {{/if}}
 
 {{#if content.length}}
-  <table class='table'> 
+  <table class='table'>
     <tr>
       {{#if showApproval}}
         <th>{{view Ember.Checkbox checkedBinding="selectAll"}}</th>
@@ -33,7 +33,7 @@
       <th>{{i18n admin.user.topics_entered}}</th>
       <th>{{i18n admin.user.posts_read_count}}</th>
       <th>{{i18n admin.user.time_read}}</th>
-      <th>{{i18n created}}</th>  
+      <th>{{i18n created}}</th>
       {{#if showApproval}}
         <th>{{i18n admin.users.approved}}</th>
       {{/if}}
@@ -54,15 +54,15 @@
           <a href="/admin/users/{{unbound username_lower}}">{{avatar this imageSize="small"}}</a>
         </td>
         <td><a href="/admin/users/{{unbound username_lower}}">{{unbound username}}</a></td>
-        <td>{{unbound email}}</td>
+        <td>{{shorten email}}</td>
         <td>{{{unbound last_emailed_age}}}</td>
         <td>{{{unbound last_seen_age}}}</td>
         <td>{{{unbound topics_entered}}}</td>
         <td>{{{unbound posts_read_count}}}</td>
         <td>{{{unbound time_read}}}</td>
-        
+
         <td>{{{unbound created_at_age}}}</td>
-        
+
         {{#if controller.showApproval}}
         <td>
           {{#if approved}}
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss
index 98602f9ef..4831e9e9f 100644
--- a/app/assets/stylesheets/admin/admin_base.scss
+++ b/app/assets/stylesheets/admin/admin_base.scss
@@ -67,12 +67,10 @@
     }
   }
   .search {
+    float: right;
+    margin-left: 10px;
     label {
       margin-top: 5px;
-      float: right;
-    }
-    input[type=text] {
-      float: right;
     }
   }
 }