diff --git a/app/assets/javascripts/admin/templates/email_index.js.handlebars b/app/assets/javascripts/admin/templates/email_index.js.handlebars
index 45c1c59dd..19f4d4a7f 100644
--- a/app/assets/javascripts/admin/templates/email_index.js.handlebars
+++ b/app/assets/javascripts/admin/templates/email_index.js.handlebars
@@ -16,7 +16,7 @@
   {{#if sendingEmail}}
   <div class='span15 controls'>{{i18n admin.email.sending_test}}</div>
   {{else}}
-  <div class='span5 controls'>
+  <div class='controls'>
     {{textField value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
   </div>
   <div class='span10 controls'>
diff --git a/app/assets/javascripts/admin/templates/email_preview_digest.js.handlebars b/app/assets/javascripts/admin/templates/email_preview_digest.js.handlebars
index c0dee55e0..52483a5ad 100644
--- a/app/assets/javascripts/admin/templates/email_preview_digest.js.handlebars
+++ b/app/assets/javascripts/admin/templates/email_preview_digest.js.handlebars
@@ -5,7 +5,7 @@
     <label for='last-seen'>{{i18n admin.email.last_seen_user}}</label>
     {{input type="date" value=lastSeen id="last-seen"}}
   </div>
-  <div class='span5'>
+  <div>
     <button class='btn' {{action refresh}}>{{i18n admin.email.refresh}}</button>
   </div>
   <div class="span7 toggle">
diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars
index bc052f194..b51cdb7d1 100644
--- a/app/assets/javascripts/admin/templates/users_list.js.handlebars
+++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars
@@ -12,7 +12,7 @@
       <li>{{#link-to 'adminUsersList.blocked'}}{{i18n admin.users.nav.blocked}}{{/link-to}}</li>
     </ul>
   </div>
-  <div class='span5 username controls'>
+  <div class='username controls'>
     {{textField value=username placeholderKey="username"}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/components/post-gutter.js.es6 b/app/assets/javascripts/discourse/components/post-gutter.js.es6
index 028585940..13f0f728f 100644
--- a/app/assets/javascripts/discourse/components/post-gutter.js.es6
+++ b/app/assets/javascripts/discourse/components/post-gutter.js.es6
@@ -1,7 +1,7 @@
 var MAX_SHOWN = 5;
 
 export default Em.Component.extend({
-  classNameBindings: [':span5', ':gutter'],
+  classNameBindings: [':gutter'],
 
   // Roll up links to avoid duplicates
   collapsed: function() {
diff --git a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
index 5b23a0423..669938907 100644
--- a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
@@ -8,7 +8,7 @@
   </div>
   <div class='topic-body'>
     <div class="topic-meta-data">
-      <h5 {{bind-attr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{{breakUp username name}}}</a></h5>
+      <h5 {{bind-attr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{{unbound username}}}</a></h5>
       {{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='fa fa-arrow-up'></i></a>{{/if}}
       <div class='post-info post-date'>{{unboundAgeWithTooltip created_at}}</div>
     </div>
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index bd438c586..0b15415bb 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -581,10 +581,6 @@ body {
   width: 300px;
   float: left;
 }
-.span5 {
-  width: 248px;
-  float: left;
-}
 .span4 {
   width: 196px;
   margin-right: 12px;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 4b693af68..cfbe98c87 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -738,10 +738,12 @@ blockquote { /* solo quotes */
 
 .gutter {
   float: left;
+  width: 19%;
   margin-top: 15px;
-      ul {margin: 0;}
-      padding-left: 8px;
+  padding-left: 8px;
 
+  ul {margin: 0;}
+  li {margin-bottom: 10px;}
   i {font-size: 12px;}
 
   .post-links {
@@ -762,7 +764,7 @@ blockquote { /* solo quotes */
       display: block;
       text-align: right;
     }
-    li {margin-bottom: 10px;}
+
   }
 }
 
@@ -796,20 +798,6 @@ blockquote { /* solo quotes */
   position: relative;
 }
 
-//columns
-
-.span5 {
-  width: 19%;
-  padding-left: 1%;
-}
-
-
-@media screen and (max-width: 960px) {
-  .span5 {
-    width: 16%;
-  } // tighten right gutter
-}
-
 .row:before, .row:after {
   display: table;
   content: "";
@@ -1066,7 +1054,7 @@ span.highlighted {
 .read-state {
   color: scale-color($tertiary, $lightness: 50%);
   position: absolute;
-  right: 0px;
+  right: -8px;
   top: 13px;
   font-size: 8px;
 }
diff --git a/app/assets/stylesheets/vendor/bootstrap.scss b/app/assets/stylesheets/vendor/bootstrap.scss
index 3b213ca74..d597d01f0 100644
--- a/app/assets/stylesheets/vendor/bootstrap.scss
+++ b/app/assets/stylesheets/vendor/bootstrap.scss
@@ -55,9 +55,6 @@ img {
 .span6 {
   width: 300px;
 }
-.span5 {
-  width: 248px;
-}
 .span4 {
   width: 196px;
 }