diff --git a/app/templates/index.hbs b/app/templates/index.hbs
index d74bdef47c..1a150ffdef 100644
--- a/app/templates/index.hbs
+++ b/app/templates/index.hbs
@@ -3,52 +3,7 @@
     <h1 class="view-title">What would you like to do?</h1>
 
     <div class="splash-nav">
-        {{#if userCan_inventory}}
-            <div class="nav-category">
-                <header class="category-header">
-                    <h2 class="primary-section">
-                        {{#link-to 'inventory' class="primary-section-link" }}
-                            <span class="mega-octicon octicon-package"></span>
-                            Inventory
-                        {{/link-to}}
-                    </h2>
-                    <div class="panel-options">
-                        <a href="#" class="hidden-link-list-trigger">
-                            <span class="mega-octicon octicon-gear"></span>
-                        </a>
-                        <nav class="hidden-link-list">
-                            <h4>More options</h4>
-                            <a href="#" class="setting-link">Pin to Nav</a>
-                            <a href="#" class="setting-link">Set as default view</a>
-                        </nav>
-                    </div>
-                </header>
-                <nav class="category-links">
-                    {{#if userCan_add_inventory_request}}
-                        {{#link-to 'inventory.index' class="sub-section-link"}}
-                            Requests
-                            <span class="octicon octicon-chevron-right"></span>
-                        {{/link-to}}
-                    {{/if}}
-                    {{#if userCan_inventory}}
-                        {{#link-to 'inventory.listing' class="sub-section-link"}}
-                            Items
-                            <span class="octicon octicon-chevron-right"></span>
-                        {{/link-to}}
-                        {{#if userCan_add_inventory_item}}
-                            {{#link-to 'inventory.batch' 'new' class="sub-section-link"}}
-                                Inventory Received
-                                <span class="octicon octicon-plus"></span>
-                            {{/link-to}}
-                        {{/if}}
-                        {{#link-to 'inventory.reports' class="sub-section-link"}}
-                            Reports
-                            <span class="octicon octicon-chevron-right"></span>
-                        {{/link-to}}
-                    {{/if}}
-                </nav>
-            </div>
-        {{/if}}
+
         {{#if userCan_patients}}
             <div class="nav-category">
                 <header class="category-header">
diff --git a/app/templates/navigation.hbs b/app/templates/navigation.hbs
index e5c8560a25..84fd017a74 100644
--- a/app/templates/navigation.hbs
+++ b/app/templates/navigation.hbs
@@ -1,31 +1,10 @@
 <nav class="sidebar-nav" role="navigation">
 
-    <header class="sidebar-nav-header sidebar-nav-section">
-        <a class="sidebar-nav-logo" href="#">
-          {{partial "components/logo-svg"}}
-        </a>
-        <a href="#" class="settings-trigger">
-            <span class="mega-octicon octicon-gear"></span>
-        </a>
-        <nav class="settings-nav">
-        {{#if session.isAuthenticated}}
-            <a href="#" class="logout" {{ action 'invalidateSession' }}>Logout</a>
-        {{else}}
-            {{#link-to 'login'}}Login{{/link-to}}
-        {{/if}}
-        </nav>
-    </header>
-
-    {{#if allowSearch}}
-    <div class="sidebar-nav-search sidebar-nav-section" role="search">
-        <div class="form-group">
-            {{text-search valueBinding="searchText" autofocus="true" placeholder="Search" class="form-control"}}
-        </div>
-        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
-    </div>
-    {{/if}}
+    {{partial "sidebar_nav/header"}}
 
+    {{partial "sidebar_nav/search"}}
 
+    {{partial "sidebar_nav/primary_nav"}}
 
     <p class="sync-status">{{syncStatus}}</p>
 
diff --git a/app/templates/sidebar_nav/header.hbs b/app/templates/sidebar_nav/header.hbs
new file mode 100644
index 0000000000..4eb1d13a79
--- /dev/null
+++ b/app/templates/sidebar_nav/header.hbs
@@ -0,0 +1,15 @@
+<header class="sidebar-nav-header sidebar-nav-section">
+    <a class="sidebar-nav-logo" href="#">
+      {{partial "components/logo-svg"}}
+    </a>
+    <a href="#" class="settings-trigger">
+        <span class="mega-octicon octicon-gear"></span>
+    </a>
+    <nav class="settings-nav">
+    {{#if session.isAuthenticated}}
+        <a href="#" class="logout" {{ action 'invalidateSession' }}>Logout</a>
+    {{else}}
+        {{#link-to 'login'}}Login{{/link-to}}
+    {{/if}}
+    </nav>
+</header>
\ No newline at end of file
diff --git a/app/templates/sidebar_nav/primary_nav.hbs b/app/templates/sidebar_nav/primary_nav.hbs
new file mode 100644
index 0000000000..910f71ae4f
--- /dev/null
+++ b/app/templates/sidebar_nav/primary_nav.hbs
@@ -0,0 +1,43 @@
+<div class="primary-nav">
+
+  {{#if userCan_inventory}}
+  <div class="sidebar-nav-section primary-nav-item">
+
+    <div class="category-title">
+      <h2>
+        {{#link-to 'inventory' class="primary-section-link" }}
+            <span class="mega-octicon octicon-package"></span>
+            Inventory
+        {{/link-to}}
+      </h2>
+    </div>
+
+    <div class="category-sub-items">
+      {{#if userCan_add_inventory_request}}
+          {{#link-to 'inventory.index' class="sub-section-link"}}
+              Requests
+              <span class="octicon octicon-chevron-right"></span>
+          {{/link-to}}
+      {{/if}}
+      {{#if userCan_inventory}}
+          {{#link-to 'inventory.listing' class="sub-section-link"}}
+              Items
+              <span class="octicon octicon-chevron-right"></span>
+          {{/link-to}}
+          {{#if userCan_add_inventory_item}}
+              {{#link-to 'inventory.batch' 'new' class="sub-section-link"}}
+                  Inventory Received
+                  <span class="octicon octicon-plus"></span>
+              {{/link-to}}
+          {{/if}}
+          {{#link-to 'inventory.reports' class="sub-section-link"}}
+              Reports
+              <span class="octicon octicon-chevron-right"></span>
+          {{/link-to}}
+      {{/if}}
+    </div>
+
+  </div>
+  {{/if}}
+
+</div>
\ No newline at end of file
diff --git a/app/templates/sidebar_nav/search.hbs b/app/templates/sidebar_nav/search.hbs
new file mode 100644
index 0000000000..56d01bee4a
--- /dev/null
+++ b/app/templates/sidebar_nav/search.hbs
@@ -0,0 +1,8 @@
+{{#if allowSearch}}
+<div class="sidebar-nav-search sidebar-nav-section" role="search">
+    <div class="form-group">
+        {{text-search valueBinding="searchText" autofocus="true" placeholder="Search" class="form-control"}}
+    </div>
+    <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</div>
+{{/if}}
\ No newline at end of file