diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-conf.hdb b/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-conf.hdb
index 33632bd9..4e4c920c 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-conf.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-conf.hdb
@@ -34,28 +34,7 @@
     </nav>
 
     <div class="container">
-
-
-        <nav class="nav nav-pills py-5">
-            <li class="nav-item">
-                <a href="conf" {{#unless view.conf}}class="nav-link"{{/unless}} {{#if view.conf}}aria-current="page" class="active nav-link"{{/if}}>Base Config</a>
-            </li>
-            <li class="nav-item">
-                <a href="crawl" {{#unless view.crawl}}class="nav-link"{{/unless}}  {{#if view.crawl}}aria-current="page" class="active nav-link"{{/if}}>Crawl Data</a>
-            </li>
-            <li class="nav-item">
-                <a href="processed" {{#unless view.processed}}class="nav-link"{{/unless}} {{#if view.processed}}aria-current="page" class="active nav-link"{{/if}}>Processed Data</a>
-            </li>
-            <li class="nav-item">
-                <a href="backup" {{#unless view.backup}}class="nav-link"{{/unless}}  {{#if view.backup}}aria-current="page" class="active nav-link"{{/if}}>Backups</a>
-            </li>
-            <li class="nav-item">
-                <a href="specs" {{#unless view.specs}}class="nav-link"{{/unless}} {{#if view.specs}}aria-current="page" class="active nav-link"{{/if}}>Specs</a>
-            </li>
-            <li class="nav-item">
-                <a href="exports" {{#unless view.exports}}class="nav-link"{{/unless}} {{#if view.exports}}aria-current="page" class="active nav-link"{{/if}}>Exports</a>
-            </li>
-        </nav>
+        {{>control/partials/storage-types}}
 
     <h1>Storage Base Configuration</h1>
     <table class="table">
diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-details.hdb b/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-details.hdb
index c24621f6..b1ed3377 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-details.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-details.hdb
@@ -34,26 +34,7 @@
     </nav>
 
     <div class="container">
-        <nav class="nav nav-pills py-5">
-            <li class="nav-item">
-                <a href="conf" {{#unless view.conf}}class="nav-link"{{/unless}} {{#if view.conf}}aria-current="page" class="active nav-link"{{/if}}>Base Config</a>
-            </li>
-            <li class="nav-item">
-                <a href="crawl" {{#unless view.crawl}}class="nav-link"{{/unless}}  {{#if view.crawl}}aria-current="page" class="active nav-link"{{/if}}>Crawl Data</a>
-            </li>
-            <li class="nav-item">
-                <a href="processed" {{#unless view.processed}}class="nav-link"{{/unless}} {{#if view.processed}}aria-current="page" class="active nav-link"{{/if}}>Processed Data</a>
-            </li>
-            <li class="nav-item">
-                <a href="backup" {{#unless view.backup}}class="nav-link"{{/unless}}   {{#if view.backup}}aria-current="page" class="active nav-link"{{/if}}>Backups</a>
-            </li>
-            <li class="nav-item">
-                <a href="specs" {{#unless view.specs}}class="nav-link"{{/unless}} {{#if view.specs}}aria-current="page" class="active nav-link"{{/if}}>Specs</a>
-            </li>
-            <li class="nav-item">
-                <a href="exports" {{#unless view.exports}}class="nav-link"{{/unless}} {{#if view.exports}}aria-current="page" class="active nav-link"{{/if}}>Exports</a>
-            </li>
-        </nav>
+        {{>control/partials/storage-types}}
 
         <h1>Storage Details</h1>
         {{#with storage.self.storage}}
diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-list.hdb b/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-list.hdb
index fe5118b4..bfacdb23 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-list.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-list.hdb
@@ -35,26 +35,7 @@
     </nav>
 
     <div class="container">
-        <nav class="nav nav-pills py-5">
-            <li class="nav-item">
-                <a href="conf" {{#unless view.conf}}class="nav-link"{{/unless}} {{#if view.conf}}aria-current="page" class="active nav-link"{{/if}}>Base Config</a>
-            </li>
-            <li class="nav-item">
-                <a href="crawl" {{#unless view.crawl}}class="nav-link"{{/unless}}  {{#if view.crawl}}aria-current="page" class="active nav-link"{{/if}}>Crawl Data</a>
-            </li>
-            <li class="nav-item">
-                <a href="processed" {{#unless view.processed}}class="nav-link"{{/unless}} {{#if view.processed}}aria-current="page" class="active nav-link"{{/if}}>Processed Data</a>
-            </li>
-            <li class="nav-item">
-                <a href="backup" {{#unless view.backup}}class="nav-link"{{/unless}}   {{#if view.backup}}aria-current="page" class="active nav-link"{{/if}}>Backups</a>
-            </li>
-            <li class="nav-item">
-                <a href="specs" {{#unless view.specs}}class="nav-link"{{/unless}} {{#if view.specs}}aria-current="page" class="active nav-link"{{/if}}>Specs</a>
-            </li>
-            <li class="nav-item">
-                <a href="exports" {{#unless view.exports}}class="nav-link"{{/unless}} {{#if view.exports}}aria-current="page" class="active nav-link"{{/if}}>Exports</a>
-            </li>
-        </nav>
+        {{>control/partials/storage-types}}
 
         <table class="table">
             {{#each storage}}
diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/storage-types.hdb b/code/services-core/control-service/src/main/resources/templates/control/partials/storage-types.hdb
index 85c39898..5275a076 100644
--- a/code/services-core/control-service/src/main/resources/templates/control/partials/storage-types.hdb
+++ b/code/services-core/control-service/src/main/resources/templates/control/partials/storage-types.hdb
@@ -1,7 +1,20 @@
-<nav class="tabs">
-    <a href="/storage">Overview</a>
-    <a href="/storage/specs">Specifications</a>
-    <a href="/storage/crawls">Crawl Data</a>
-    <a href="/storage/processed">Processed Data</a>
-    <a href="/storage/backups">Backups</a>
+<nav class="nav nav-pills py-5">
+    <li class="nav-item">
+        <a href="conf" {{#unless view.conf}}class="nav-link"{{/unless}} {{#if view.conf}}aria-current="page" class="active nav-link"{{/if}}>Base Config</a>
+    </li>
+    <li class="nav-item">
+        <a href="crawl" {{#unless view.crawl}}class="nav-link"{{/unless}}  {{#if view.crawl}}aria-current="page" class="active nav-link"{{/if}}>Crawl Data</a>
+    </li>
+    <li class="nav-item">
+        <a href="processed" {{#unless view.processed}}class="nav-link"{{/unless}} {{#if view.processed}}aria-current="page" class="active nav-link"{{/if}}>Processed Data</a>
+    </li>
+    <li class="nav-item">
+        <a href="backup" {{#unless view.backup}}class="nav-link"{{/unless}}   {{#if view.backup}}aria-current="page" class="active nav-link"{{/if}}>Backups</a>
+    </li>
+    <li class="nav-item">
+        <a href="specs" {{#unless view.specs}}class="nav-link"{{/unless}} {{#if view.specs}}aria-current="page" class="active nav-link"{{/if}}>Specs</a>
+    </li>
+    <li class="nav-item">
+        <a href="exports" {{#unless view.exports}}class="nav-link"{{/unless}} {{#if view.exports}}aria-current="page" class="active nav-link"{{/if}}>Exports</a>
+    </li>
 </nav>
\ No newline at end of file