diff --git a/docs/theme/mkdocs/base.html b/docs/theme/mkdocs/base.html
index b99cc8acc6..574825bb57 100644
--- a/docs/theme/mkdocs/base.html
+++ b/docs/theme/mkdocs/base.html
@@ -47,12 +47,16 @@
 <div id="wrap">
   {% include "nav.html" %}
   <div id="content" class="container">
-{% if current_page.title != '**HIDDEN**' %}
-    <div class="row" id="top-header">
-      <div class="span7">
-        <h1 class="header2">{{ current_page.title }}</h1>
+    <div class="row">
+      <div class="span3" id="leftnav">
+        <div id="toc_table">
+          <ul class="nav nav-tabs nav-stacked">
+            {% include "toc.html" %}
+          </ul>
+        </div>
       </div>
-      <div class="span5">
+      <div class="span9 content-body">
+        {% include "beta_warning.html" %}
         <div id="versionnav" class="span3 pull-right">
           <ul class="nav version pull-right">
             <li class="dropdown">
@@ -66,19 +70,6 @@
             </li>
           </ul>
         </div>
-      </div>
-    </div>
-{% endif %}
-    <div class="row">
-      <div class="span3" id="leftnav">
-        <div id="toc_table">
-          <ul class="nav nav-tabs nav-stacked">
-            {% include "toc.html" %}
-          </ul>
-        </div>
-      </div>
-      <div class="span9 content-body">
-        {% include "beta_warning.html" %}
         {{ content }}
       </div>
     </div>
diff --git a/docs/theme/mkdocs/css/docs.css b/docs/theme/mkdocs/css/docs.css
index d4536d7b0c..6a3bdd4875 100644
--- a/docs/theme/mkdocs/css/docs.css
+++ b/docs/theme/mkdocs/css/docs.css
@@ -328,4 +328,10 @@ ol li {
 }
 table.table tr td img {
     width:100%;
-}
\ No newline at end of file
+}
+#versionnav ul {
+    list-style: none outside none;
+}
+#versionnav ul ul {
+    padding: 0;
+}