diff --git a/www/austin/index.html b/www/austin/index.html
index bb8b5e5b02..e933e13a60 100644
--- a/www/austin/index.html
+++ b/www/austin/index.html
@@ -4,46 +4,4 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
-    </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/bexar/index.html b/www/bexar/index.html
index bb8b5e5b02..e933e13a60 100644
--- a/www/bexar/index.html
+++ b/www/bexar/index.html
@@ -4,46 +4,4 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
-    </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/cactus/index.html b/www/cactus/index.html
index bb8b5e5b02..e933e13a60 100644
--- a/www/cactus/index.html
+++ b/www/cactus/index.html
@@ -4,46 +4,4 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
-    </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/diablo/index.html b/www/diablo/index.html
index bb8b5e5b02..e933e13a60 100644
--- a/www/diablo/index.html
+++ b/www/diablo/index.html
@@ -4,46 +4,4 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
-    </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/essex/index.html b/www/essex/index.html
index bb8b5e5b02..e933e13a60 100644
--- a/www/essex/index.html
+++ b/www/essex/index.html
@@ -4,46 +4,4 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
-    </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/folsom/index.html b/www/folsom/index.html
index bb8b5e5b02..e933e13a60 100644
--- a/www/folsom/index.html
+++ b/www/folsom/index.html
@@ -4,46 +4,4 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
-    </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/grizzly/index.html b/www/grizzly/index.html
index bb8b5e5b02..e933e13a60 100644
--- a/www/grizzly/index.html
+++ b/www/grizzly/index.html
@@ -4,46 +4,4 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
-    </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/havana/index.html b/www/havana/index.html
index bb8b5e5b02..e933e13a60 100644
--- a/www/havana/index.html
+++ b/www/havana/index.html
@@ -4,46 +4,4 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
-    </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/icehouse/index.html b/www/icehouse/index.html
index 1e9aa70636..01ade70ba3 100644
--- a/www/icehouse/index.html
+++ b/www/icehouse/index.html
@@ -4,71 +4,19 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-8 col-md-8 col-sm-8">
-        <h1>Welcome to OpenStack Documentation</h1>
-        <p>
-          <strong>What is OpenStack?</strong> OpenStack is a
-          cloud operating system that controls large pools
-          of compute, storage, and networking resources
-          throughout a datacenter, all managed through a
-          dashboard that gives administrators control while
-          empowering their users to provision resources
-          through a web interface.
-        </p>
-        <hr>
-        <h3>What are the next steps?</h3>
-        <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-        <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-        <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-        {% include 'templates/swiftype_search.tmpl' %}
-      </div>
-      <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-        <div id="superuser-img"></div>
-      </div>
-    </div>
-  </div>
-  <div class="mid-docs-wrapper" id="docs-main-body">
-    <div class="container">
-
-      <div class="row">
-        <div class="col-lg-9 col-md-9 col-sm-9">
-          <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-          {% include "templates/series_status.tmpl" %}
-        </div>
-        {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-      </div>
-
-    </div>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12"></div>
   </div>
 
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-12"></div>
-    </div>
-
-    <div class="row docs-toc">
-      <div class="col-lg-6 col-md-6 col-sm-6">
-        <div class="docs-link-sections">
-          <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-          <a href="config-guide/">Configuration Reference</a>
-          <p>Installation and configuration options for OpenStack</p>
-        </div>
+  <div class="row docs-toc">
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
+        <a href="config-guide/">Configuration Reference</a>
+        <p>Installation and configuration options for OpenStack</p>
       </div>
     </div>
-
-    <div class="row docs-contribute-wrapper">
-      <div class="col-lg-12">
-        <p>Documentation treated like code, powered by the community - interested?</p>
-        <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-      </div>
-    </div>
-
   </div>
 </div>
-
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/juno/index.html b/www/juno/index.html
index 3bb6c0382f..01ade70ba3 100644
--- a/www/juno/index.html
+++ b/www/juno/index.html
@@ -4,70 +4,19 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-8 col-md-8 col-sm-8">
-        <h1>Welcome to OpenStack Documentation</h1>
-        <p>
-          <strong>What is OpenStack?</strong> OpenStack is a
-          cloud operating system that controls large pools
-          of compute, storage, and networking resources
-          throughout a datacenter, all managed through a
-          dashboard that gives administrators control while
-          empowering their users to provision resources
-          through a web interface.
-        </p>
-        <hr>
-        <h3>What are the next steps?</h3>
-        <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-        <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-        <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-        {% include 'templates/swiftype_search.tmpl' %}
-      </div>
-      <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-        <div id="superuser-img"></div>
-      </div>
-    </div>
-  </div>
-  <div class="mid-docs-wrapper" id="docs-main-body">
-    <div class="container">
-
-      <div class="row">
-        <div class="col-lg-9 col-md-9 col-sm-9">
-          <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-          {% include "templates/series_status.tmpl" %}
-        </div>
-        {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-      </div>
-
-    </div>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12"></div>
   </div>
 
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-12"></div>
-    </div>
-
-    <div class="row docs-toc">
-      <div class="col-lg-6 col-md-6 col-sm-6">
-        <div class="docs-link-sections">
-          <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-          <a href="config-guide/">Configuration Reference</a>
-          <p>Installation and configuration options for OpenStack</p>
-        </div>
+  <div class="row docs-toc">
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
+        <a href="config-guide/">Configuration Reference</a>
+        <p>Installation and configuration options for OpenStack</p>
       </div>
     </div>
-
-    <div class="row docs-contribute-wrapper">
-      <div class="col-lg-12">
-        <p>Documentation treated like code, powered by the community - interested?</p>
-        <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-      </div>
-    </div>
-
   </div>
 </div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/kilo/index.html b/www/kilo/index.html
index 9211d198e1..614a7c6ed0 100644
--- a/www/kilo/index.html
+++ b/www/kilo/index.html
@@ -4,75 +4,26 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-8 col-md-8 col-sm-8">
-        <h1>Welcome to OpenStack Documentation</h1>
-        <p>
-          <strong>What is OpenStack?</strong> OpenStack is a
-          cloud operating system that controls large pools
-          of compute, storage, and networking resources
-          throughout a datacenter, all managed through a
-          dashboard that gives administrators control while
-          empowering their users to provision resources
-          through a web interface.
-        </p>
-        <hr>
-        <h3>What are the next steps?</h3>
-        <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-        <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-        <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-        {% include 'templates/swiftype_search.tmpl' %}
-      </div>
-      <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-        <div id="superuser-img"></div>
-      </div>
-    </div>
-  </div>
-  <div class="mid-docs-wrapper" id="docs-main-body">
-    <div class="container">
-
-      <div class="row">
-        <div class="col-lg-9 col-md-9 col-sm-9">
-          <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-          {% include "templates/series_status.tmpl" %}
-        </div>
-        {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-      </div>
-    </div>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12"></div>
   </div>
 
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-12"></div>
-    </div>
-
-    <div class="row docs-toc">
-      <div class="col-lg-6 col-md-6 col-sm-6">
-        <div class="docs-link-sections">
-          <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-          <a href="config-guide/">Configuration Reference</a>
-          <p>Installation and configuration options for OpenStack</p>
-        </div>
-      </div>
-      <div class="col-lg-6 col-md-6 col-sm-6">
-        <div class="docs-link-sections">
-          <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> Operations and Administration Guides</h3>
-          <a href="networking-guide/">Networking Guide</a>
-          <p>Deploy and manage OpenStack Networking (neutron)</p>
-        </div>
+  <div class="row docs-toc">
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
+        <a href="config-guide/">Configuration Reference</a>
+        <p>Installation and configuration options for OpenStack</p>
       </div>
     </div>
-  </div>
-
-  <div class="row docs-contribute-wrapper">
-    <div class="col-lg-12">
-      <p>Documentation treated like code, powered by the community - interested?</p>
-      <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> Operations and Administration Guides</h3>
+        <a href="networking-guide/">Networking Guide</a>
+        <p>Deploy and manage OpenStack Networking (neutron)</p>
+      </div>
     </div>
   </div>
 </div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/liberty/index.html b/www/liberty/index.html
index 4522d03485..e00407e401 100644
--- a/www/liberty/index.html
+++ b/www/liberty/index.html
@@ -4,86 +4,37 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-8 col-md-8 col-sm-8">
-        <h1>Welcome to OpenStack Documentation</h1>
-        <p>
-          <strong>What is OpenStack?</strong> OpenStack is a
-          cloud operating system that controls large pools
-          of compute, storage, and networking resources
-          throughout a datacenter, all managed through a
-          dashboard that gives administrators control while
-          empowering their users to provision resources
-          through a web interface.
-        </p>
-        <hr>
-        <h3>What are the next steps?</h3>
-        <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-        <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-        <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-        {% include 'templates/swiftype_search.tmpl' %}
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12"></div>
+  </div>
+
+  <div class="row docs-toc">
+    <div class="col-lg-6 col-md-6 col-sm-6">
+
+      <div class="docs-link-sections">
+        <h3 id="install-guides"><i class="fa fa-cogs"></i> Installation Tutorials and Guides</h3>
+        <p>Getting started with the most commonly used OpenStack services</p>
+        <a href="install-guide-obs/">Installation Tutorials and Guides for openSUSE or SUSE Linux Enterpreise</a><br/>
+        <a href="install-guide-rdo/">Installation Tutorials and Guides for CentOS or Red Hat Enterprise Linux</a><br/>
+        <a href="install-guide-ubuntu/">Installation Tutorials and Guides for Ubuntu Linux</a><br/>
       </div>
-      <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-        <div id="superuser-img"></div>
+
+      <div class="docs-link-sections">
+        <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
+        <a href="config-guide/">Configuration Reference</a>
+        <p>Installation and configuration options for OpenStack</p>
       </div>
     </div>
-  </div>
-  <div class="mid-docs-wrapper" id="docs-main-body">
-    <div class="container">
 
-      <div class="row">
-        <div class="col-lg-9 col-md-9 col-sm-9">
-          <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-          {% include "templates/series_status.tmpl" %}
-        </div>
-        {% include 'templates/dropdown_releases_and_languages.tmpl' %}
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> Operations and Administration Guides</h3>
+        <a href="networking-guide/">Networking Guide</a>
+        <p>Deploy and manage OpenStack Networking (neutron)</p>
       </div>
     </div>
   </div>
 
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-12"></div>
-    </div>
-
-    <div class="row docs-toc">
-      <div class="col-lg-6 col-md-6 col-sm-6">
-
-        <div class="docs-link-sections">
-          <h3 id="install-guides"><i class="fa fa-cogs"></i> Installation Tutorials and Guides</h3>
-          <p>Getting started with the most commonly used OpenStack services</p>
-          <a href="install-guide-obs/">Installation Tutorials and Guides for openSUSE or SUSE Linux Enterpreise</a><br/>
-          <a href="install-guide-rdo/">Installation Tutorials and Guides for CentOS or Red Hat Enterprise Linux</a><br/>
-          <a href="install-guide-ubuntu/">Installation Tutorials and Guides for Ubuntu Linux</a><br/>
-        </div>
-
-        <div class="docs-link-sections">
-          <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-          <a href="config-guide/">Configuration Reference</a>
-          <p>Installation and configuration options for OpenStack</p>
-        </div>
-      </div>
-
-      <div class="col-lg-6 col-md-6 col-sm-6">
-        <div class="docs-link-sections">
-          <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> Operations and Administration Guides</h3>
-          <a href="networking-guide/">Networking Guide</a>
-          <p>Deploy and manage OpenStack Networking (neutron)</p>
-        </div>
-      </div>
-    </div>
-
-  </div>
-
-  <div class="row docs-contribute-wrapper">
-    <div class="col-lg-12">
-      <p>Documentation treated like code, powered by the community - interested?</p>
-      <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-    </div>
-  </div>
 </div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/mitaka/index.html b/www/mitaka/index.html
index 90725e2167..e6d787e8b1 100644
--- a/www/mitaka/index.html
+++ b/www/mitaka/index.html
@@ -1,87 +1,46 @@
-{% extends "templates/base.tmpl" %}
+{% extends "templates/indexbase.tmpl" %}
 {% block pagetitle %}Mitaka{% endblock %}
 {% block title %}{% endblock %}
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12"></div>
+  </div>
+  <div class="row docs-toc">
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="release-notes"><i class="fa fa-refresh"></i>Release Notes</h3>
+        <p>New features, upgrade and deprecation notes, known issues, and bug fixes</p>
+        <a href="http://releases.openstack.org/mitaka/index.html">OpenStack Projects Release Notes</a>
+        <a href="/releasenotes/openstack-manuals/mitaka.html">OpenStack Documentation Release Notes</a>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="install-guides"><i class="fa fa-cogs"></i> Install Guides</h3>
+        <p>Getting started with the most commonly used OpenStack services</p>
+        <a href="/mitaka/install-guide-obs/">Installation Guide for openSUSE Leap 42.1 and SUSE Linux Enterprise Server 12 SP1</a>
+        <a href="/mitaka/install-guide-rdo/">Installation Guide for Red Hat Enterprise Linux 7 and CentOS 7</a>
+        <a href="/mitaka/install-guide-ubuntu/">Installation Guide for Ubuntu 14.04 (LTS)</a>
+      </div>
+      <div class="docs-link-sections">
+        {% include 'templates/ops_and_admin_guides.tmpl' %}
+        <a href="/mitaka/networking-guide/">Networking Guide</a>
+        <p>Deploy and manage OpenStack Networking (neutron)</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
+        <a href="/mitaka/config-reference/">Configuration Reference</a>
+        <p>Installation and configuration options for OpenStack</p>
+      </div>
+      {% include 'templates/api_guides.tmpl' %}
     </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-12">
-            </div>
-        </div>
-        <div class="row docs-toc">
-            <div class="col-lg-6 col-md-6 col-sm-6">
-                <div class="docs-link-sections">
-                    <h3 id="release-notes"><i class="fa fa-refresh"></i>Release Notes</h3>
-                    <p>New features, upgrade and deprecation notes, known issues, and bug fixes</p>
-                    <a href="http://releases.openstack.org/mitaka/index.html">OpenStack Projects Release Notes</a>
-                    <a href="/releasenotes/openstack-manuals/mitaka.html">OpenStack Documentation Release Notes</a>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="install-guides"><i class="fa fa-cogs"></i> Install Guides</h3>
-                    <p>Getting started with the most commonly used OpenStack services</p>
-                    <a href="/mitaka/install-guide-obs/">Installation Guide for openSUSE Leap 42.1 and SUSE Linux Enterprise Server 12 SP1</a>
-                    <a href="/mitaka/install-guide-rdo/">Installation Guide for Red Hat Enterprise Linux 7 and CentOS 7</a>
-                    <a href="/mitaka/install-guide-ubuntu/">Installation Guide for Ubuntu 14.04 (LTS)</a>
-                </div>
-                <div class="docs-link-sections">
-                    {% include 'templates/ops_and_admin_guides.tmpl' %}
-                    <a href="/mitaka/networking-guide/">Networking Guide</a>
-                    <p>Deploy and manage OpenStack Networking (neutron)</p>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-                    <a href="/mitaka/config-reference/">Configuration Reference</a>
-                    <p>Installation and configuration options for OpenStack</p>
-                </div>
-                {% include 'templates/api_guides.tmpl' %}
-            </div>
-            <div class="col-lg-6 col-md-6 col-sm-6">
-                {% include 'templates/user_guides.tmpl' %}
-                {% include 'templates/project_guides.tmpl' %}
-                {% include 'templates/contributor_guides.tmpl' %}
-                {% include 'templates/training_guides.tmpl' %}
-            </div>
-        </div>
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      {% include 'templates/user_guides.tmpl' %}
+      {% include 'templates/project_guides.tmpl' %}
+      {% include 'templates/contributor_guides.tmpl' %}
+      {% include 'templates/training_guides.tmpl' %}
     </div>
+  </div>
 </div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/newton/index.html b/www/newton/index.html
index eb2233dbfc..76da9512db 100644
--- a/www/newton/index.html
+++ b/www/newton/index.html
@@ -1,90 +1,49 @@
-{% extends "templates/base.tmpl" %}
+{% extends "templates/indexbase.tmpl" %}
 {% block pagetitle %}Newton{% endblock %}
 {% block title %}{% endblock %}
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12"></div>
+  </div>
+  <div class="row docs-toc">
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="release-notes"><i class="fa fa-refresh"></i>Release Notes</h3>
+        <p>New features, upgrade and deprecation notes, known issues, and bug fixes</p>
+        <a href="http://releases.openstack.org/newton/index.html">OpenStack Projects Release Notes</a>
+        <a href="https://docs.openstack.org/releasenotes/openstack-manuals/newton.html">OpenStack Documentation Release Notes</a>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="install-guides"><i class="fa fa-cogs"></i> Installation Tutorials and Guides</h3>
+        <p>Getting started with the most commonly used OpenStack services</p>
+        <a href="/project-install-guide/newton/">Installation Tutorials and Guides</a>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="project-deploy-guide"><i class="fa fa-cogs"></i> Deployment Guides</h3>
+        <p>Choose how to deploy OpenStack and get started with the most commonly used OpenStack services</p>
+        <a href="/project-deploy-guide/newton/">Deployment Guides</a>
+      </div>
+      <div class="docs-link-sections">
+        {% include 'templates/ops_and_admin_guides.tmpl' %}
+        <a href="/newton/networking-guide/">Networking Guide</a>
+        <p>Deploy and manage OpenStack Networking (neutron)</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
+        <a href="/newton/config-reference/">Configuration Reference</a>
+        <p>Installation and configuration options for OpenStack</p>
+      </div>
+      {% include 'templates/api_guides.tmpl' %}
     </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-12">
-            </div>
-        </div>
-        <div class="row docs-toc">
-            <div class="col-lg-6 col-md-6 col-sm-6">
-                <div class="docs-link-sections">
-                    <h3 id="release-notes"><i class="fa fa-refresh"></i>Release Notes</h3>
-                    <p>New features, upgrade and deprecation notes, known issues, and bug fixes</p>
-                    <a href="http://releases.openstack.org/newton/index.html">OpenStack Projects Release Notes</a>
-                    <a href="https://docs.openstack.org/releasenotes/openstack-manuals/newton.html">OpenStack Documentation Release Notes</a>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="install-guides"><i class="fa fa-cogs"></i> Installation Tutorials and Guides</h3>
-                    <p>Getting started with the most commonly used OpenStack services</p>
-                    <a href="/project-install-guide/newton/">Installation Tutorials and Guides</a>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="project-deploy-guide"><i class="fa fa-cogs"></i> Deployment Guides</h3>
-                    <p>Choose how to deploy OpenStack and get started with the most commonly used OpenStack services</p>
-                    <a href="/project-deploy-guide/newton/">Deployment Guides</a>
-                </div>
-                <div class="docs-link-sections">
-                    {% include 'templates/ops_and_admin_guides.tmpl' %}
-                    <a href="/newton/networking-guide/">Networking Guide</a>
-                    <p>Deploy and manage OpenStack Networking (neutron)</p>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-                    <a href="/newton/config-reference/">Configuration Reference</a>
-                    <p>Installation and configuration options for OpenStack</p>
-                </div>
-                {% include 'templates/api_guides.tmpl' %}
-            </div>
-            <div class="col-lg-6 col-md-6 col-sm-6">
-                {% include 'templates/user_guides.tmpl' %}
-                {% include 'templates/project_guides.tmpl' %}
-                {% include 'templates/contributor_guides.tmpl' %}
-                {% include 'templates/training_guides.tmpl' %}
-            </div>
-        </div>
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="https://docs.openstack.org/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      {% include 'templates/user_guides.tmpl' %}
+      {% include 'templates/project_guides.tmpl' %}
+      {% include 'templates/contributor_guides.tmpl' %}
+      {% include 'templates/training_guides.tmpl' %}
     </div>
+  </div>
 </div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/ocata/index.html b/www/ocata/index.html
index 8f9571f346..ebd2175d1e 100644
--- a/www/ocata/index.html
+++ b/www/ocata/index.html
@@ -1,140 +1,100 @@
-{% extends "templates/base.tmpl" %}
+{% extends "templates/indexbase.tmpl" %}
 {% block pagetitle %}Ocata{% endblock %}
 {% block title %}{% endblock %}
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12">
     </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
+  </div>
+  <div class="row docs-toc">
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="release-notes"><i class="fa fa-refresh"></i>Release Notes</h3>
+        <p>New features, upgrade and deprecation notes, known issues, and bug fixes</p>
+        <a href="https://releases.openstack.org/ocata/index.html">OpenStack Projects Release Notes</a>
+        <a href="https://docs.openstack.org/releasenotes/openstack-manuals/ocata.html">OpenStack Documentation Release Notes</a>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="install-guides"><i class="fa fa-cogs"></i> Installation Tutorials and Guides</h3>
+        <p>Getting started with the most commonly used OpenStack services</p>
+        <a href="install">Installation Tutorials and Guides</a>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="project-deploy-guide"><i class="fa fa-cogs"></i> Deployment Guides</h3>
+        <p>Choose how to deploy OpenStack and get started with the most commonly used OpenStack services</p>
+        <a href="deploy">Deployment Guides</a>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> Operations and Administration Guides</h3>
+        <a href="admin">Administrator Guides</a>
+        <p>Manage and troubleshoot an OpenStack cloud</p>
+        <a href="/ha-guide/">High Availability Guide</a><a href="/ha-guide/HAGuide.pdf">[PDF]</a>
+        <p>Install and configure OpenStack for high availability</p>
+        <a href="/security-guide/">Security Guide</a>
+        <p>Guidelines and scenarios for creating more secure OpenStack clouds</p>
+        <a href="/image-guide/">Virtual Machine Image Guide</a><a href="/image-guide/ImageGuide.pdf">[PDF]</a>
+        <p>Obtain, create, and modify OpenStack-compatible virtual machine images</p>
+        <a href="/arch-design/">Architecture Design Guide</a><a href="/arch-design/ArchGuide.pdf">[PDF]</a>
+        <p>Guidelines for designing an OpenStack cloud</p>
+        <a href="/ocata/networking-guide/">Networking Guide</a><a href="/ocata/networking-guide/NetworkingGuide.pdf">[PDF]</a>
+        <p>Deploy and manage OpenStack Networking (neutron)</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
+        <a href="/ocata/config-reference/">Configuration Reference</a>
+        <p>Installation and configuration options for OpenStack</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="api-guides"><i class="fa fa-book"></i> API Guides</h3>
+        <a href="api">API Guides</a>
+        <p>OpenStack API Documentation</p>
+      </div>
     </div>
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-12">
-            </div>
-        </div>
-        <div class="row docs-toc">
-            <div class="col-lg-6 col-md-6 col-sm-6">
-                <div class="docs-link-sections">
-                    <h3 id="release-notes"><i class="fa fa-refresh"></i>Release Notes</h3>
-                    <p>New features, upgrade and deprecation notes, known issues, and bug fixes</p>
-                    <a href="https://releases.openstack.org/ocata/index.html">OpenStack Projects Release Notes</a>
-                    <a href="https://docs.openstack.org/releasenotes/openstack-manuals/ocata.html">OpenStack Documentation Release Notes</a>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="install-guides"><i class="fa fa-cogs"></i> Installation Tutorials and Guides</h3>
-                    <p>Getting started with the most commonly used OpenStack services</p>
-                    <a href="install">Installation Tutorials and Guides</a>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="project-deploy-guide"><i class="fa fa-cogs"></i> Deployment Guides</h3>
-                    <p>Choose how to deploy OpenStack and get started with the most commonly used OpenStack services</p>
-                    <a href="deploy">Deployment Guides</a>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> Operations and Administration Guides</h3>
-                    <a href="admin">Administrator Guides</a>
-                    <p>Manage and troubleshoot an OpenStack cloud</p>
-                    <a href="/ha-guide/">High Availability Guide</a><a href="/ha-guide/HAGuide.pdf">[PDF]</a>
-                    <p>Install and configure OpenStack for high availability</p>
-                    <a href="/security-guide/">Security Guide</a>
-                    <p>Guidelines and scenarios for creating more secure OpenStack clouds</p>
-                    <a href="/image-guide/">Virtual Machine Image Guide</a><a href="/image-guide/ImageGuide.pdf">[PDF]</a>
-                    <p>Obtain, create, and modify OpenStack-compatible virtual machine images</p>
-                    <a href="/arch-design/">Architecture Design Guide</a><a href="/arch-design/ArchGuide.pdf">[PDF]</a>
-                    <p>Guidelines for designing an OpenStack cloud</p>
-                    <a href="/ocata/networking-guide/">Networking Guide</a><a href="/ocata/networking-guide/NetworkingGuide.pdf">[PDF]</a>
-                    <p>Deploy and manage OpenStack Networking (neutron)</p>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-                    <a href="/ocata/config-reference/">Configuration Reference</a>
-                    <p>Installation and configuration options for OpenStack</p>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="api-guides"><i class="fa fa-book"></i> API Guides</h3>
-                    <a href="api">API Guides</a>
-                    <p>OpenStack API Documentation</p>
-                </div>
-            </div>
-            <div class="col-lg-6 col-md-6 col-sm-6">
-                <div class="docs-link-sections">
-                    <h3 id="user-guides"><i class="fa fa-cloud"></i> User Guides</h3>
-                    <a href="user/">End User Guide (includes Python SDK)</a>
-                    <p>Create and manage resources using the OpenStack dashboard, command-line client, and Python SDK</p>
-                    <a href="https://developer.openstack.org">Open source software for application development</a>
-                    <p>Resources for application development on OpenStack clouds</p>
-                </div>
-                    <div class="docs-link-sections">
-                        <h3 id="contributor-guides"><i class="fa fa-leaf"></i> Project-specific Guides</h3>
-                        <a href="projects.html">Services and Libraries</a>
-                        <p>Documentation for OpenStack services and libraries</p>
-                        <a href="language-bindings.html">Language Bindings and Python Clients</a>
-                        <p>Documentation for the OpenStack Python bindings and clients</p>
-                    </div>
-                    <div class="docs-link-sections">
-                        <h3 id="contributor-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
-                        <a href="/contributor-guide/index.html">OpenStack Documentation Contributor Guide</a>
-                        <p>Documentation workflow and conventions</p>
-                        <a href="https://governance.openstack.org/tc/">OpenStack Technical Committee Governance Documents</a>
-                        <p>OpenStack Technical Committee reference documents and official resolutions</p>
-                        <a href="http://specs.openstack.org/">OpenStack Project specifications</a>
-                        <p>Specifications for future project features</p>
-                        <a href="/project-team-guide/">OpenStack Project Team Guide</a>
-                        <p>Guide to the OpenStack project and community</p>
-                        <a href="/infra/">OpenStack Developer and Community Infrastructure Documentation</a>
-                        <p>Development and infrastructure documentation</p>
-                        <a href="/developer/i18n/">OpenStack I18n Guide</a>
-                        <p>Internationalization workflow and conventions</p>
-                        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-                        <p>How to join the OpenStack Foundation</p>
-                        <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
-                        <p>Influence the future of OpenStack</p>
-                    </div>
-                <div class="docs-link-sections">
-                    <h3 id="training-guides"><i class="fa fa-university"></i> Training Guides And Training Labs</h3>
-                    <a href="/upstream-training/">Upstream training</a>
-                    <p>Resources for the OpenStack Upstream Training program</p>
-                    <a href="/training_labs/">Training Labs</a>
-                    <p>Tools for OpenStack Training. Automatic deployment of lean virtualized multi-node openstack cluster.</p>
-                </div>
-            </div>
-        </div>
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="user-guides"><i class="fa fa-cloud"></i> User Guides</h3>
+        <a href="user/">End User Guide (includes Python SDK)</a>
+        <p>Create and manage resources using the OpenStack dashboard, command-line client, and Python SDK</p>
+        <a href="https://developer.openstack.org">Open source software for application development</a>
+        <p>Resources for application development on OpenStack clouds</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="contributor-guides"><i class="fa fa-leaf"></i> Project-specific Guides</h3>
+        <a href="projects.html">Services and Libraries</a>
+        <p>Documentation for OpenStack services and libraries</p>
+        <a href="language-bindings.html">Language Bindings and Python Clients</a>
+        <p>Documentation for the OpenStack Python bindings and clients</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="contributor-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
+        <a href="/contributor-guide/index.html">OpenStack Documentation Contributor Guide</a>
+        <p>Documentation workflow and conventions</p>
+        <a href="https://governance.openstack.org/tc/">OpenStack Technical Committee Governance Documents</a>
+        <p>OpenStack Technical Committee reference documents and official resolutions</p>
+        <a href="http://specs.openstack.org/">OpenStack Project specifications</a>
+        <p>Specifications for future project features</p>
+        <a href="/project-team-guide/">OpenStack Project Team Guide</a>
+        <p>Guide to the OpenStack project and community</p>
+        <a href="/infra/">OpenStack Developer and Community Infrastructure Documentation</a>
+        <p>Development and infrastructure documentation</p>
+        <a href="/developer/i18n/">OpenStack I18n Guide</a>
+        <p>Internationalization workflow and conventions</p>
+        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
+        <p>How to join the OpenStack Foundation</p>
+        <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
+        <p>Influence the future of OpenStack</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="training-guides"><i class="fa fa-university"></i> Training Guides And Training Labs</h3>
+        <a href="/upstream-training/">Upstream training</a>
+        <p>Resources for the OpenStack Upstream Training program</p>
+        <a href="/training_labs/">Training Labs</a>
+        <p>Tools for OpenStack Training. Automatic deployment of lean virtualized multi-node openstack cluster.</p>
+      </div>
     </div>
+  </div>
 </div>
-<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/pike/index.html b/www/pike/index.html
index 6eacc1e6e1..d026472e1c 100644
--- a/www/pike/index.html
+++ b/www/pike/index.html
@@ -4,131 +4,91 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-<!-- Begin Page Content -->
-<div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                {% include 'templates/swiftype_search.tmpl' %}
-            </div>
-            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-                <div id="superuser-img"></div>
-            </div>
-        </div>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-12"></div>
+  </div>
+  <div class="row docs-toc">
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="release-notes"><i class="fa fa-refresh"></i>Release Notes</h3>
+        <p>New features, upgrade and deprecation notes, known issues, and bug fixes</p>
+        <a href="http://releases.openstack.org/pike/index.html">OpenStack Projects Release Notes</a>
+        <a href="/releasenotes/openstack-manuals/pike.html">OpenStack Documentation Release Notes</a>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="install-guides"><i class="fa fa-cogs"></i> Installation Tutorials and Guides</h3>
+        <p>Getting started with the most commonly used OpenStack services</p>
+        <a href="install/">Installation Tutorials and Guides</a>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="project-deploy-guide"><i class="fa fa-cogs"></i> Deployment Guides</h3>
+        <p>Choose how to deploy OpenStack and get started with the most commonly used OpenStack services</p>
+        <a href="deploy/">Deployment Guides</a>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> Operations and Administration Guides</h3>
+        <a href="admin/">Administrator Guides</a>
+        <p>Manage and troubleshoot an OpenStack cloud</p>
+        <a href="/ha-guide/">High Availability Guide</a><a href="/ha-guide/HAGuide.pdf">[PDF]</a>
+        <p>Install and configure OpenStack for high availability</p>
+        <a href="/image-guide/">Virtual Machine Image Guide</a><a href="/image-guide/ImageGuide.pdf">[PDF]</a>
+        <p>Obtain, create, and modify OpenStack-compatible virtual machine images</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
+        <a href="configuration/">Configuration Reference</a>
+        <p>Installation and configuration options for OpenStack</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="api-guides"><i class="fa fa-book"></i> API Guides</h3>
+        <a href="api/">API Guides</a>
+        <p>OpenStack API Documentation</p>
+      </div>
     </div>
-    <div class="mid-docs-wrapper" id="docs-main-body">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-9 col-md-9 col-sm-9">
-                    <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
-                    {% include "templates/series_status.tmpl" %}
-                </div>
-                {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-            </div>
-        </div>
-    </div>
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-12">
-            </div>
-        </div>
-        <div class="row docs-toc">
-            <div class="col-lg-6 col-md-6 col-sm-6">
-                <div class="docs-link-sections">
-                    <h3 id="release-notes"><i class="fa fa-refresh"></i>Release Notes</h3>
-                    <p>New features, upgrade and deprecation notes, known issues, and bug fixes</p>
-                    <a href="http://releases.openstack.org/pike/index.html">OpenStack Projects Release Notes</a>
-                    <a href="/releasenotes/openstack-manuals/pike.html">OpenStack Documentation Release Notes</a>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="install-guides"><i class="fa fa-cogs"></i> Installation Tutorials and Guides</h3>
-                    <p>Getting started with the most commonly used OpenStack services</p>
-                    <a href="install/">Installation Tutorials and Guides</a>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="project-deploy-guide"><i class="fa fa-cogs"></i> Deployment Guides</h3>
-                    <p>Choose how to deploy OpenStack and get started with the most commonly used OpenStack services</p>
-                    <a href="deploy/">Deployment Guides</a>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> Operations and Administration Guides</h3>
-                    <a href="admin/">Administrator Guides</a>
-                    <p>Manage and troubleshoot an OpenStack cloud</p>
-                    <a href="/ha-guide/">High Availability Guide</a><a href="/ha-guide/HAGuide.pdf">[PDF]</a>
-                    <p>Install and configure OpenStack for high availability</p>
-                    <a href="/image-guide/">Virtual Machine Image Guide</a><a href="/image-guide/ImageGuide.pdf">[PDF]</a>
-                    <p>Obtain, create, and modify OpenStack-compatible virtual machine images</p>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-                    <a href="configuration/">Configuration Reference</a>
-                    <p>Installation and configuration options for OpenStack</p>
-                </div>
-                <div class="docs-link-sections">
-                    <h3 id="api-guides"><i class="fa fa-book"></i> API Guides</h3>
-                    <a href="api/">API Guides</a>
-                    <p>OpenStack API Documentation</p>
-                </div>
-            </div>
-            <div class="col-lg-6 col-md-6 col-sm-6">
-                <div class="docs-link-sections">
-                    <h3 id="user-guides"><i class="fa fa-cloud"></i> User Guides</h3>
-                    <a href="user/">End User Guides</a>
-                    <p>Create and manage resources using the OpenStack dashboard, command-line client, and Python SDK</p>
-                    <a href="https://developer.openstack.org">Open source software for application development</a>
-                    <p>Resources for application development on OpenStack clouds</p>
-                </div>
-                    <div class="docs-link-sections">
-                        <h3 id="contributor-guides"><i class="fa fa-leaf"></i> Project-specific Guides</h3>
-                        <a href="projects.html">Services and Libraries</a>
-                        <p>Documentation for OpenStack services and libraries</p>
-                        <a href="language-bindings.html">Language Bindings and Python Clients</a>
-                        <p>Documentation for the OpenStack Python bindings and clients</p>
-                    </div>
-                    <div class="docs-link-sections">
-                        <h3 id="contributor-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
-                        <a href="/contributor-guide/index.html">OpenStack Documentation Contributor Guide</a>
-                        <p>Documentation workflow and conventions</p>
-                        <a href="https://governance.openstack.org/tc/">OpenStack Technical Committee Governance Documents</a>
-                        <p>OpenStack Technical Committee reference documents and official resolutions</p>
-                        <a href="http://specs.openstack.org/">OpenStack Project specifications</a>
-                        <p>Specifications for future project features</p>
-                        <a href="/project-team-guide/">OpenStack Project Team Guide</a>
-                        <p>Guide to the OpenStack project and community</p>
-                        <a href="/infra/">OpenStack Developer and Community Infrastructure Documentation</a>
-                        <p>Development and infrastructure documentation</p>
-                        <a href="/i18n/">OpenStack I18n Guide</a>
-                        <p>Internationalization workflow and conventions</p>
-                        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
-                        <p>How to join the OpenStack Foundation</p>
-                        <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
-                        <p>Influence the future of OpenStack</p>
-                    </div>
-                <div class="docs-link-sections">
-                    <h3 id="training-guides"><i class="fa fa-university"></i> Training Guides And Training Labs</h3>
-                    <a href="/upstream-training/">Upstream training</a>
-                    <p>Resources for the OpenStack Upstream Training program</p>
-                    <a href="/training_labs/">Training Labs</a>
-                    <p>Tools for OpenStack Training. Automatic deployment of lean virtualized multi-node openstack cluster.</p>
-                </div>
-            </div>
-        </div>
-        <div class="row docs-contribute-wrapper">
-            <div class="col-lg-12">
-                <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-            </div>
-        </div>
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <div class="docs-link-sections">
+        <h3 id="user-guides"><i class="fa fa-cloud"></i> User Guides</h3>
+        <a href="user/">End User Guides</a>
+        <p>Create and manage resources using the OpenStack dashboard, command-line client, and Python SDK</p>
+        <a href="https://developer.openstack.org">Open source software for application development</a>
+        <p>Resources for application development on OpenStack clouds</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="contributor-guides"><i class="fa fa-leaf"></i> Project-specific Guides</h3>
+        <a href="projects.html">Services and Libraries</a>
+        <p>Documentation for OpenStack services and libraries</p>
+        <a href="language-bindings.html">Language Bindings and Python Clients</a>
+        <p>Documentation for the OpenStack Python bindings and clients</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="contributor-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
+        <a href="/contributor-guide/index.html">OpenStack Documentation Contributor Guide</a>
+        <p>Documentation workflow and conventions</p>
+        <a href="https://governance.openstack.org/tc/">OpenStack Technical Committee Governance Documents</a>
+        <p>OpenStack Technical Committee reference documents and official resolutions</p>
+        <a href="http://specs.openstack.org/">OpenStack Project specifications</a>
+        <p>Specifications for future project features</p>
+        <a href="/project-team-guide/">OpenStack Project Team Guide</a>
+        <p>Guide to the OpenStack project and community</p>
+        <a href="/infra/">OpenStack Developer and Community Infrastructure Documentation</a>
+        <p>Development and infrastructure documentation</p>
+        <a href="/i18n/">OpenStack I18n Guide</a>
+        <p>Internationalization workflow and conventions</p>
+        <a href="https://www.openstack.org/join/">Join the OpenStack Foundation</a>
+        <p>How to join the OpenStack Foundation</p>
+        <a href="https://www.openstack.org/user-survey/">Take the Deployment Survey</a>
+        <p>Influence the future of OpenStack</p>
+      </div>
+      <div class="docs-link-sections">
+        <h3 id="training-guides"><i class="fa fa-university"></i> Training Guides And Training Labs</h3>
+        <a href="/upstream-training/">Upstream training</a>
+        <p>Resources for the OpenStack Upstream Training program</p>
+        <a href="/training_labs/">Training Labs</a>
+        <p>Tools for OpenStack Training. Automatic deployment of lean virtualized multi-node openstack cluster.</p>
+      </div>
     </div>
+  </div>
 </div>
 <!-- End Page Content -->
 {% endblock content %}
diff --git a/www/templates/indexbase.tmpl b/www/templates/indexbase.tmpl
index c941c9cda9..d2cea55a70 100644
--- a/www/templates/indexbase.tmpl
+++ b/www/templates/indexbase.tmpl
@@ -16,7 +16,49 @@
  </head>
  <body>
 {% include 'templates/header.tmpl' %}
-{% block content %}{% endblock %}
+<div class="top-docs-wrapper">
+  <div class="container">
+    <div class="row">
+      <div class="col-lg-8 col-md-8 col-sm-8">
+        <h1>Welcome to OpenStack Documentation</h1>
+        <p>
+          <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
+        </p>
+        <hr>
+          <h3>What are the next steps?</h3>
+          <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
+          <a href="https://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
+          <a href="https://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
+          {% include 'templates/swiftype_search.tmpl' %}
+        </div>
+        <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
+          <div id="superuser-img"></div>
+        </div>
+      </div>
+    </div>
+    <div class="mid-docs-wrapper" id="docs-main-body">
+      <div class="container">
+        <div class="row">
+          <div class="col-lg-9 col-md-9 col-sm-9">
+            <h2>Documentation for {{SERIES_TITLE}} ({{SERIES_INFO.date}})</h2>
+            {% include "templates/series_status.tmpl" %}
+          </div>
+          {% include 'templates/dropdown_releases_and_languages.tmpl' %}
+        </div>
+      </div>
+    </div>
+    <!-- Begin Page Content -->
+    {% block content %}{% endblock %}
+    <!-- End Page Content -->
+    <div class="container">
+      <div class="row docs-contribute-wrapper">
+        <div class="col-lg-12">
+          <p>Documentation treated like code, powered by the community - interested?</p>
+          <a href="/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+        </div>
+      </div>
+    </div>
+</div>
 {% include 'templates/footer.tmpl' %}
 {% include 'templates/script_footer.tmpl' %}
  </body>