diff --git a/app/admin/route.js b/app/admin/route.js
index ce6c9cdac1..6b44a03950 100644
--- a/app/admin/route.js
+++ b/app/admin/route.js
@@ -4,27 +4,7 @@ export default AbstractModuleRoute.extend({
   allowSearch: false,
   moduleName: 'admin',
   sectionTitle: 'Admin',
-  subActions: function() {
-    var options = [{
-      text: this.get('i18n').t('admin.address_options'),
-      linkTo: 'admin.address'
-    }, {
-      text: this.get('i18n').t('admin.lookup_lists'),
-      linkTo: 'admin.lookup'
-    }];
-    if (this.currentUserCan('load_db')) {
-      options.push({
-        text: this.get('i18n').t('admin.load_db'),
-        linkTo: 'admin.loaddb'
-      });
-    }
-    options.push({
-      text: this.get('i18n').t('admin.users'),
-      linkTo: 'users.index'
-    });
-    return options;
-  }.property(),
-
+  
   editPath: function() {
     return 'users.edit';
   }.property(),
diff --git a/app/appointments/route.js b/app/appointments/route.js
index 0000df0c6b..4cc8ef0299 100644
--- a/app/appointments/route.js
+++ b/app/appointments/route.js
@@ -32,16 +32,5 @@ export default AbstractModuleRoute.extend(UserSession, {
   }, {
     name: 'visitTypesList',
     findArgs: ['lookup', 'visit_types']
-  }],
-
-  subActions: [{
-    text: 'This Week',
-    linkTo: 'appointments.index'
-  }, {
-    text: 'Today',
-    linkTo: 'appointments.today'
-  }, {
-    text: 'Search',
-    linkTo: 'appointments.search'
   }]
 });
diff --git a/app/imaging/route.js b/app/imaging/route.js
index 4b5cd4f24b..3f4f8640c1 100644
--- a/app/imaging/route.js
+++ b/app/imaging/route.js
@@ -12,18 +12,5 @@ export default AbstractModuleRoute.extend({
   allowSearch: false,
   moduleName: 'imaging',
   newButtonText: t('imaging.buttons.new_button'),
-  sectionTitle: t('imaging.section_title'),
-  subActions: function() {
-    let i18n = this.get('i18n');
-
-    return [{
-      text: i18n.t('labels.requests'),
-      linkTo: 'imaging.index'
-    }, {
-      text: i18n.t('labels.completed'),
-      linkTo: 'imaging.completed'
-    }];
-
-  }.property()
-
+  sectionTitle: t('imaging.section_title')
 });
diff --git a/app/inventory/route.js b/app/inventory/route.js
index a6601b7743..e90cc050a0 100644
--- a/app/inventory/route.js
+++ b/app/inventory/route.js
@@ -38,16 +38,6 @@ export default AbstractModuleRoute.extend(FulfillRequest, InventoryId, Inventory
   moduleName: 'inventory',
 
   newButtonText: '+ new request',
-  subActions: [{
-    text: 'Requests',
-    linkTo: 'inventory.index'
-  }, {
-    text: 'Items',
-    linkTo: 'inventory.listing'
-  }, {
-    text: 'Reports',
-    linkTo: 'inventory.reports'
-  }],
   sectionTitle: 'Inventory',
 
   actions: {
diff --git a/app/labs/route.js b/app/labs/route.js
index 321a5e442a..5fe4f15ff5 100644
--- a/app/labs/route.js
+++ b/app/labs/route.js
@@ -8,12 +8,5 @@ export default AbstractModuleRoute.extend({
   allowSearch: false,
   moduleName: 'labs',
   newButtonText: '+ new lab',
-  sectionTitle: 'Labs',
-  subActions: [{
-    text: 'Requests',
-    linkTo: 'labs.index'
-  }, {
-    text: 'Completed',
-    linkTo: 'labs.completed'
-  }]
+  sectionTitle: 'Labs'
 });
diff --git a/app/medication/route.js b/app/medication/route.js
index f06baa275b..e690456e5a 100644
--- a/app/medication/route.js
+++ b/app/medication/route.js
@@ -45,17 +45,6 @@ export default AbstractModuleRoute.extend({
     findArgs: ['lookup', 'warehouse_list']
   }],
 
-  subActions: function() {
-    let i18n = this.get('i18n');
-    return [{
-      text: i18n.t('labels.requests'),
-      linkTo: 'medication.index'
-    }, {
-      text: i18n.t('labels.completed'),
-      linkTo: 'medication.completed'
-    }];
-  }.property(),
-
   actions: {
     dispenseMedication: function() {
       if (this.currentUserCan('fulfill_medication')) {
diff --git a/app/patients/route.js b/app/patients/route.js
index 4f3add3541..101d1aab2c 100644
--- a/app/patients/route.js
+++ b/app/patients/route.js
@@ -50,14 +50,6 @@ export default AbstractModuleRoute.extend(PatientId, {
       }.bind(this));
     }
   },
-  moduleName: 'patients',
   newButtonText: '+ new patient',
-  sectionTitle: 'Patients',
-  subActions: [{
-    text: 'Patient listing',
-    linkTo: 'patients.index'
-  }, {
-    text: 'Reports',
-    linkTo: 'patients.reports'
-  }]
+  moduleName: 'patients'
 });
diff --git a/app/styles/_bootstrap-theme.scss b/app/styles/_bootstrap-theme.scss
index 30cc677107..bb0ddea592 100644
--- a/app/styles/_bootstrap-theme.scss
+++ b/app/styles/_bootstrap-theme.scss
@@ -264,8 +264,6 @@
       padding: 0;
       color: $navy;
     }
-
-    .panel-body { padding-top: 0; }
   }
 }
 
diff --git a/app/styles/_variables_mixins.scss b/app/styles/_variables_mixins.scss
index bbd0037b1e..e0d835b3ab 100644
--- a/app/styles/_variables_mixins.scss
+++ b/app/styles/_variables_mixins.scss
@@ -56,6 +56,7 @@ $view_sub_nav:          #6784a2;
   font-size: 28px;
   line-height: 55px;
   margin: 0;
+  float: left;
 }
 
 // layout
diff --git a/app/templates/section.hbs b/app/templates/section.hbs
index 4477ec0c2e..48be81ebe9 100644
--- a/app/templates/section.hbs
+++ b/app/templates/section.hbs
@@ -4,10 +4,6 @@
 
         <div class="view-top-bar">
             <h1 class="view-current-title">{{currentScreenTitle}}</h1>
-        </div>
-
-        <div class="view-sub-bar">
-
             <div class="view-action-buttons">
                 {{#if newButtonAction}}
                 <button class="btn btn-primary" {{action newButtonAction}}>{{newButtonText}}</button>
@@ -20,7 +16,9 @@
                     {{/each}}
                 {{/if}}
             </div>
+        </div>
 
+        <div class="view-sub-bar">
             <ul class="nav nav-pills view-sub-nav">
                 {{#each subActions as |subAction|}}
                     {{#if subAction.statusQuery}}