diff --git a/docs/app/assets/css/docs.css b/docs/app/assets/css/docs.css
index d36b0b1f..b77db528 100644
--- a/docs/app/assets/css/docs.css
+++ b/docs/app/assets/css/docs.css
@@ -17,6 +17,14 @@ md-toolbar .md-button.toolbar-btn {
     padding: 10px 15px;
 }
 
+.back-breadcrumb {
+    opacity: 0.1;
+    padding: 5px;
+    margin-top: 5px;
+    margin-left: 5px;
+    z-index: 3;
+}
+
 .back-to-top {
     bottom: 10px;
     display: inline-block;
diff --git a/docs/config/templates/indexPage.template.html b/docs/config/templates/indexPage.template.html
index 054177b7..8bf9512f 100644
--- a/docs/config/templates/indexPage.template.html
+++ b/docs/config/templates/indexPage.template.html
@@ -69,31 +69,7 @@
   </script>
 </head>
 <body>
-<!--
-    <header scroll-y-offset-element class="header header-fixed">
-      <section class="sup-header">
-        <div class="container main-grid main-header-grid">
-          <div class="grid-left">
-            <div ng-controller="DocsVersionsCtrl" class="picker version-picker">
-              <select ng-options="v as ('v' + v.version + (v.isSnapshot ? ' (snapshot)' : '')) group by getGroupName(v) for v in docs_versions"
-                      ng-model="docs_version"
-                      ng-change="jumpToDocsVersion(docs_version)"
-                      class="docs-version-jump">
-              </select>
-            </div>
-          </div>
-          <div class="grid-right">
-            <ul class="nav-breadcrumb">
-              <li ng-repeat="crumb in breadcrumb" class="nav-breadcrumb-entry naked-list">
-                <span class="divider"> /</span>
-                <a ng-href="{{crumb.url}}">{{crumb.name}}</a>
-              </li>
-            </ul>
-          </div>
-        </div>
-      </section>
-    </header>
--->
+
   <div class="viewport" layout="column" layout-fill>
 
     <!-- HEADER -->
@@ -201,6 +177,18 @@
           ng-attr-flex="{{vu.getFlex('toc')}}">
         <md-content>
           <md-list layout="column">
+            <md-item>
+              <md-subheader class="tight">
+                <h2>Version Picker</h2>
+              </md-subheader>
+              <div ng-controller="DocsVersionsCtrl" class="picker version-picker">
+                <select ng-options="v as ('v' + v.version + (v.isSnapshot ? ' (snapshot)' : '')) group by getGroupName(v) for v in docs_versions"
+                        ng-model="docs_version"
+                        ng-change="jumpToDocsVersion(docs_version)"
+                        class="docs-version-jump">
+                </select>
+              </div>
+            </md-item>
             <md-item ng-repeat="navGroup in currentArea.navGroups track by navGroup.name">
               <md-subheader class="tight">
                 <h2><a href="{{navGroup.href}}" xng-class="navClass(navGroup)">{{navGroup.name}}</a></h2>
@@ -252,6 +240,19 @@
           <!-- LOADER -->
           <div id="loading" ng-show="loading">Loading...</div>
 
+          <!-- Breadcrumb Back Button -->
+          <div ng-if="breadcrumb.length > 1" layout="row">
+            <md-button
+                class="md-primary md-raised back-breadcrumb"
+                href="{{breadcrumb[breadcrumb.length-2].url}}"
+                md-theme="red"
+                ng-mouseenter="bttHovered=true"
+                ng-mouseleave="bttHovered=false"
+                ng-style="{opacity:bttHovered?'1.0':null}">
+                Back to {{breadcrumb[breadcrumb.length-2].name}}
+            </md-button>
+          </div>
+
           <!-- MAIN CONTENT AREA -->
           <md-content
               class="content-area md-padding"
