diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index 5cfd1231144..33229e22534 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -1,12 +1,12 @@
 <div class='admin-backups'>
   <div class="admin-controls">
-    <div class="span15">
+    <nav>
       <ul class="nav nav-pills">
         {{nav-item route='admin.backups.index' label='admin.backups.menu.backups'}}
         {{nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}}
         {{plugin-outlet name="downloader" tagName=""}}
       </ul>
-    </div>
+    </nav>
     <div class="pull-right">
       {{#if model.canRollback}}
         {{d-button action="rollback"
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 674eae8de29..4a71e7d69a0 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -1,4 +1,4 @@
-{{#d-section class="current-badge span13"}}
+{{#d-section class="current-badge content-body"}}
   <p>{{i18n 'admin.badges.none_selected'}}</p>
 
   <div>
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index 94239f9d03c..6fa158d0f30 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -1,4 +1,4 @@
-{{#d-section class="current-badge span13"}}
+{{#d-section class="current-badge content-body"}}
   <form class="form-horizontal">
     <div>
       <label for="name">{{i18n 'admin.badges.name'}}</label>
@@ -144,7 +144,7 @@
 {{/d-section}}
 
 {{#if grant_count}}
-  <div class="span13 current-badge-actions">
+  <div class="content-body current-badge-actions">
     <div>
       {{#link-to 'badges.show' this}}{{i18n 'badges.granted' count=grant_count}}{{/link-to}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs
index aeeaac9c9e2..b5789d4c42a 100644
--- a/app/assets/javascripts/admin/templates/badges.hbs
+++ b/app/assets/javascripts/admin/templates/badges.hbs
@@ -1,6 +1,6 @@
 <div class="badges">
 
-  <div class='content-list span6'>
+  <div class='content-list'>
     <h3>{{i18n 'admin.badges.title'}}</h3>
     <ul>
       {{#each model as |badge|}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-nav.hbs b/app/assets/javascripts/admin/templates/components/admin-nav.hbs
index c5b1d3b58a7..eb705949e54 100644
--- a/app/assets/javascripts/admin/templates/components/admin-nav.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-nav.hbs
@@ -1,7 +1,7 @@
 <div class='admin-controls'>
-  <div class='span15'>
+  <nav>
     <ul class="nav nav-pills">
       {{yield}}
     </ul>
-  </div>
+  </nav>
 </div>
diff --git a/app/assets/javascripts/admin/templates/customize-colors.hbs b/app/assets/javascripts/admin/templates/customize-colors.hbs
index 920f6f19540..761996b6cb9 100644
--- a/app/assets/javascripts/admin/templates/customize-colors.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors.hbs
@@ -1,4 +1,4 @@
-<div class='content-list span6 color-schemes'>
+<div class='content-list color-schemes'>
   <h3>{{i18n 'admin.customize.colors.long_title'}}</h3>
   <ul>
     {{#each model as |scheme|}}
diff --git a/app/assets/javascripts/admin/templates/customize-email-templates.hbs b/app/assets/javascripts/admin/templates/customize-email-templates.hbs
index 152c02e44a2..7dd95b092f5 100644
--- a/app/assets/javascripts/admin/templates/customize-email-templates.hbs
+++ b/app/assets/javascripts/admin/templates/customize-email-templates.hbs
@@ -1,5 +1,5 @@
 <div class='row'>
-  <div class='content-list span6'>
+  <div class='content-list'>
     <ul>
       {{#each sortedTemplates as |et|}}
         <li>
diff --git a/app/assets/javascripts/admin/templates/customize-themes.hbs b/app/assets/javascripts/admin/templates/customize-themes.hbs
index c9474917ef6..e2f9f8b99a2 100644
--- a/app/assets/javascripts/admin/templates/customize-themes.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes.hbs
@@ -1,5 +1,5 @@
 {{#unless editingTheme}}
-<div class='content-list span6'>
+<div class='content-list'>
   <h3>{{i18n 'admin.customize.theme.long_title'}}</h3>
   <ul>
     {{#each sortedThemes as |theme|}}
diff --git a/app/assets/javascripts/admin/templates/email-index.hbs b/app/assets/javascripts/admin/templates/email-index.hbs
index 7fc5ce5d838..80b3d5d062d 100644
--- a/app/assets/javascripts/admin/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/templates/email-index.hbs
@@ -19,7 +19,7 @@
   <div class='controls'>
     {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
   </div>
-  <div class='span10 controls'>
+  <div class='controls'>
     <button class='btn btn-primary' {{action "sendTestEmail"}} disabled={{sendTestEmailDisabled}}>{{i18n 'admin.email.send_test'}}</button>
     {{#if sentTestEmail}}<span class='result-message'>{{i18n 'admin.email.sent_test'}}</span>{{/if}}
   </div>
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 675e8249be0..4cf568fd450 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -6,7 +6,7 @@
   <p>{{emoji-uploader done="emojiUploaded"}}</p>
 
   {{#if sortedEmojis}}
-    <div class="span8">
+    <div>
       <table id="custom_emoji">
         <thead>
           <tr>
diff --git a/app/assets/javascripts/admin/templates/groups-type.hbs b/app/assets/javascripts/admin/templates/groups-type.hbs
index a1fa8298970..47bbb1c51e7 100644
--- a/app/assets/javascripts/admin/templates/groups-type.hbs
+++ b/app/assets/javascripts/admin/templates/groups-type.hbs
@@ -1,6 +1,6 @@
 <div class='row groups'>
   {{#if sortedGroups}}
-    <div class='content-list span6'>
+    <div class='content-list'>
       <h3>{{i18n 'admin.groups.edit'}}</h3>
       <ul>
         {{#each sortedGroups as |group|}}
@@ -25,7 +25,7 @@
     </div>
   {{/if}}
 
-  <div class="span13">
+  <div class="content-body">
     {{outlet}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index 167f4ffa1d6..52faf9b4333 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -1,9 +1,9 @@
 <div class='admin-controls'>
-  <div class='span15'>
+  <nav>
     <ul class='nav nav-pills'>
       <li>{{#link-to 'adminUser' user}}{{d-icon "caret-left"}} &nbsp;{{user.username}}{{/link-to}}</li>
     </ul>
-  </div>
+  </nav>
 </div>
 
 {{#conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index 1561a95670b..1a848710a33 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -1,10 +1,10 @@
 <div class='admin-controls'>
-  <div class='span15'>
+  <nav>
     <ul class="nav nav-pills">
       <li>{{#link-to 'adminUser' model}}{{d-icon "caret-left"}} &nbsp;{{model.username}}{{/link-to}}</li>
       <li>{{#link-to 'adminUsersList.show' 'member'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}</li>
     </ul>
-  </div>
+  </nav>
 </div>
 
 <div class="admin-container tl3-requirements">
diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
index 398732685b1..645fc83c1ff 100644
--- a/app/assets/javascripts/admin/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/templates/users-list.hbs
@@ -1,5 +1,5 @@
 <div class='admin-controls'>
-  <div class='span15'>
+  <nav>
     <ul class="nav nav-pills">
       {{nav-item route='adminUsersList.show' routeParam='active' label='admin.users.nav.active'}}
       {{nav-item route='adminUsersList.show' routeParam='new' label='admin.users.nav.new'}}
@@ -11,7 +11,7 @@
       {{nav-item route='adminUsersList.show' routeParam='silenced' label='admin.users.nav.silenced'}}
       {{nav-item route='adminUsersList.show' routeParam='suspect' label='admin.users.nav.suspect'}}
     </ul>
-  </div>
+  </nav>
   <div class="pull-right">
     {{#unless siteSettings.enable_sso}}
       {{d-button action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 539101bdaf7..a7b6c0705b8 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -1,6 +1,6 @@
 {{#d-modal-body id="keyboard-shortcuts-help"}}
   <div class="row">
-    <div class="span6">
+    <div>
       <h4>{{i18n 'keyboard_shortcuts_help.jump_to.title'}}</h4>
       <ul>
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.home'}}}</li>
@@ -24,7 +24,7 @@
         <li>{{{i18n 'keyboard_shortcuts_help.navigation.next_prev'}}}</li>
       </ul>
     </div>
-    <div class="span6">
+    <div>
       <h4>{{i18n 'keyboard_shortcuts_help.application.title'}}</h4>
       <ul>
         <li>{{{i18n 'keyboard_shortcuts_help.application.hamburger_menu'}}}</li>
@@ -46,7 +46,7 @@
         <li>{{{i18n 'keyboard_shortcuts_help.actions.quote_post'}}}</li>
       </ul>
     </div>
-    <div class="span6">
+    <div>
       <h4>{{i18n 'keyboard_shortcuts_help.actions.title'}}</h4>
       <ul>
         <li>{{{i18n 'keyboard_shortcuts_help.actions.bookmark_topic'}}}</li>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 5f8dc6d18ad..c02499e76bf 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -5,13 +5,13 @@
         <h2>{{i18n 'user.invited.title'}}</h2>
 
         {{#if model.can_see_invite_details}}
-          <div class='user-invite-controls'>
-            <div class='span15'>
+          <div class='admin-controls'>
+            <nav>
               <ul class="nav nav-pills">
                 {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}}
                 {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}}
               </ul>
-            </div>
+            </nav>
 
             <div class="pull-right">
               {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}}
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 2786a6e61a8..670d93d8947 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -130,14 +130,23 @@ $mobile-breakpoint: 700px;
   }
 }
 
-.content-list li a span.count {
-  font-size: $font-down-1;
-  float: right;
-  margin-right: 10px;
-  background-color: $primary-low;
-  padding: 2px 5px;
-  border-radius: 5px;
-  color: $primary;
+.content-list {
+  width: 27%;
+  float: left;
+  li a span.count {
+    font-size: $font-down-1;
+    float: right;
+    margin-right: 10px;
+    background-color: $primary-low;
+    padding: 2px 5px;
+    border-radius: 5px;
+    color: $primary;
+  }
+}
+
+.content-body {
+  float: left;
+  width: 60%;
 }
 
 .admin-content {
@@ -259,6 +268,10 @@ $mobile-breakpoint: 700px;
   background-color: $primary-low;
   padding: 10px 10px 3px 0;
   @include clearfix;
+  nav {
+    float: left;
+    margin-left: 12px;    
+  }
   .nav.nav-pills {
     li.active {
       a {
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 9a23fb7d738..97a589ca742 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -220,3 +220,7 @@
     margin-top: 20px;
   }
 }
+
+.custom_emoji {
+  width: 27%;
+}
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
index 04045f843f9..13010953fe4 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.scss
@@ -15,8 +15,12 @@
 }
 
 #keyboard-shortcuts-help {
-  .span6 {
-    width:32%;
+  div.row {
+    width: 100%;
+    div {
+      float: left;
+      width:32%;
+    }
   }
   ul {
     list-style: none;
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 5f718e9502a..8dce9693b50 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -351,46 +351,6 @@ input {
   @include clearfix;
 }
 
-.span {
-  &4 {
-    width: 196px;
-    margin-right: 12px;
-    float: left;
-  }
-
-  &6 {
-    width: 27.027%;
-    float: left;
-  }
-
-  &8 {
-    width: 404px;
-    float: left;
-  }
-
-  &10 {
-    width: 508px;
-    float: left;
-  }
-
-  &13 {
-    width: 59.8198%;
-    float: left;
-  }
-
-  &15 {
-    /* intentionally no width set here, do not add one */
-    margin-left: 12px;
-    float: left;
-  }
-
-  &24 {
-    width: 1236px;
-    float: left;
-    color: amarillo;
-  }
-}
-
 .offset {
   &2 {
     margin-left: 116px;
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index d342a3a83eb..0fb3e102f9f 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -109,12 +109,6 @@
   }
 }
 
-.user-invite-controls {
-  background-color: $primary-low;
-  padding: 5px 10px 0 0;
-  height: 35px;
-}
-
 .user-invite-search {
   clear: both;
   margin: 15px 0px -15px 0px;