diff --git a/www/havana/index.html b/www/havana/index.html
index 31f5d01d1c..bdaf7d07a8 100644
--- a/www/havana/index.html
+++ b/www/havana/index.html
@@ -1,7 +1,7 @@
 {% set scriptdir = '../common/js/' %}
 {% set cssdir = '../common/css/' %}
 {% extends "templates/base.tmpl" %}
-{% block pagetitle %}Current{% endblock %}
+{% block pagetitle %}Havana{% endblock %}
 {% block title %}{% endblock %}
 {% block header %}
 {% endblock header %}
diff --git a/www/icehouse/index.html b/www/icehouse/index.html
index 09128d8e62..5b90f5ea3b 100644
--- a/www/icehouse/index.html
+++ b/www/icehouse/index.html
@@ -1,7 +1,7 @@
 {% set scriptdir = '../common/js/' %}
 {% set cssdir = '../common/css/' %}
 {% extends "templates/base.tmpl" %}
-{% block pagetitle %}Current{% endblock %}
+{% block pagetitle %}Icehouse{% endblock %}
 {% block title %}{% endblock %}
 {% block header %}
 {% endblock header %}
diff --git a/www/index.html b/www/index.html
index 2cb6ce4af5..5e8f248410 100644
--- a/www/index.html
+++ b/www/index.html
@@ -6,8 +6,8 @@
 {% block header %}
 {% endblock header %}
 {% block content %}
-    <!-- Begin Page Content -->
-    <div class="top-docs-wrapper">
+<!-- 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">
@@ -21,7 +21,7 @@
                 <a href="http://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
                 <a href="http://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
                 <form class="docs-main-search-form">
-      <script type="text/javascript">
+                    <script type="text/javascript">
         (function() {
         var cx = '000108871792296872333:noj9nikm74i';
         var gcse = document.createElement('script');
@@ -33,111 +33,110 @@
         var s = document.getElementsByTagName('script')[0];
         s.parentNode.insertBefore(gcse, s);
       })();
-       </script>
-       <gcse:search gname="standard" as_sitesearch="docs.openstack.org">
-       </gcse:search>
-       </form>
-       </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 Kilo (April 2015)</h2>
-                <p>This is the latest release. Use the menu to select a prior release if needed.</p>
+                    </script>
+                    <gcse:search gname="standard" as_sitesearch="docs.openstack.org">
+                    </gcse:search>
+                </form>
+            </div>
+            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
+                <div id="superuser-img"></div>
             </div>
-            {% include 'templates/dropdown_releases_and_languages.tmpl' %}
         </div>
     </div>
-</div>
+    <div class="mid-docs-wrapper" id="docs-main-body">
         <div class="container">
             <div class="row">
-                <div class="col-lg-12">
+                <div class="col-lg-9 col-md-9 col-sm-9">
+                    <h2>Documentation for Kilo (April 2015)</h2>
+                    <p>This is the latest release. Use the menu to select a prior release if needed.</p>
+                </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="install-guides"><i class="fa fa-cogs"></i> Install Guides</h3>
+                    <a href="/kilo/install-guide/install/zypper/content/">Installation Guide for openSUSE 13.2 and SUSE Linux Enterprise Server 12</a>
+                    <a href="/kilo/install-guide/install/yum/content/">Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and Fedora 21</a>
+                    <a href="/kilo/install-guide/install/apt/content/">Installation Guide for Ubuntu 14.04 (LTS)</a>
+                </div>
+                <div class="docs-link-sections">
+                    <h3 id="api-guides"><i class="fa fa-book"></i> API References</h3>
+                    <a href="http://developer.openstack.org/api-ref.html">API Complete Reference (HTML)</a>
+                    <a href="http://developer.openstack.org/api-ref-guides/bk-api-ref.pdf">API Complete Reference (PDF)</a>
+                    <a href="http://developer.openstack.org/api-ref-blockstorage-v2.html">Block Storage API v2 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-blockstorage-v1.html">Block Storage API v1 (DEPRECATED)</a>
+                    <a href="http://developer.openstack.org/api-ref-compute-v2.1.html">Compute API v2.1 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-compute-v2.html">Compute API v2 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-compute-v2-ext.html">Compute API v2 extensions (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-data-processing-v1.1.html">Data Processing v1.1 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-database-v1.html">Database Service API v1.0 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-identity-v3.html">Identity API v3 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-identity-v3-ext.html">Identity API v3 extensions (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-identity-v2.html">Identity API v2.0 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-identity-admin-v2.html">Identity Admin API v2.0 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-identity-v2-ext.html">Identity API v2.0 extensions (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-image-v2.html">Image Service API v2 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-image-v1.html">Image Service API v1 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-networking-v2.html">Networking API v2.0 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-networking-v2-ext.html">Networking API v2.0 extensions (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-objectstorage-v1.html">Object Storage API v1 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-orchestration-v1.html">Orchestration API v1 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-share-v2.html">Shared File Systems API v2 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-share-v1.html">Shared File Systems API v1 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-telemetry-v2.html">Telemetry API v2 (CURRENT)</a>
+                </div>
+                <div class="docs-link-sections">
+                    <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
+                    <a href="/arch-design/content/">Architecture Design Guide</a>
+                    <a href="/kilo/config-reference/content/">Configuration Reference</a>
+                    <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
+                    <a href="/high-availability-guide/content/index.html">High Availability Guide</a>
+                    <a href="/ops/">Operations Guide</a>
+                    <a href="/security-guide/">Security Guide</a>
+                    <a href="/image-guide/content/">Virtual Machine Image Guide</a>
                 </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> Install Guides</h3>
-                        <a href="/kilo/install-guide/install/zypper/content/">Installation Guide for openSUSE 13.2 and SUSE Linux Enterprise Server 12</a>
-                        <a href="/kilo/install-guide/install/yum/content/">Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and Fedora 21</a>
-                        <a href="/kilo/install-guide/install/apt/content/">Installation Guide for Ubuntu 14.04 (LTS)</a>
-                    </div>
-                    <div class="docs-link-sections">
-                        <h3 id="api-guides"><i class="fa fa-book"></i> API References</h3>
-                        <a href="http://developer.openstack.org/api-ref.html">API Complete Reference (HTML)</a>
-                        <a href="http://developer.openstack.org/api-ref-guides/bk-api-ref.pdf">API Complete Reference (PDF)</a>
-
-                        <a href="http://developer.openstack.org/api-ref-blockstorage-v2.html">Block Storage API v2 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-blockstorage-v1.html">Block Storage API v1 (DEPRECATED)</a>
-                        <a href="http://developer.openstack.org/api-ref-compute-v2.1.html">Compute API v2.1 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-compute-v2.html">Compute API v2 (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-compute-v2-ext.html">Compute API v2 extensions (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-data-processing-v1.1.html">Data Processing v1.1 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-database-v1.html">Database Service API v1.0 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-identity-v3.html">Identity API v3 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-identity-v3-ext.html">Identity API v3 extensions (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-identity-v2.html">Identity API v2.0 (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-identity-admin-v2.html">Identity Admin API v2.0 (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-identity-v2-ext.html">Identity API v2.0 extensions (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-image-v2.html">Image Service API v2 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-image-v1.html">Image Service API v1 (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-networking-v2.html">Networking API v2.0 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-networking-v2-ext.html">Networking API v2.0 extensions (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-objectstorage-v1.html">Object Storage API v1 (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-orchestration-v1.html">Orchestration API v1 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-share-v2.html">Shared File Systems API v2 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-share-v1.html">Shared File Systems API v1 (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-telemetry-v2.html">Telemetry API v2 (CURRENT)</a>
-                    </div>
-                    <div class="docs-link-sections">
-                        <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-                        <a href="/arch-design/content/">Architecture Design Guide</a>
-                        <a href="/kilo/config-reference/content/">Configuration Reference</a>
-                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
-                        <a href="/high-availability-guide/content/index.html">High Availability Guide</a>
-                        <a href="/ops/">Operations Guide</a>
-                        <a href="/security-guide/">Security Guide</a>
-                        <a href="/image-guide/content/">Virtual Machine Image Guide</a>
-                    </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="/admin-guide-cloud/">Cloud Administrator Guide</a>
+                    <a href="/high-availability-guide/content/">High Availability Guide</a>
+                    <a href="/networking-guide/">Networking Guide</a>
+                    <a href="/ops/">Operations Guide</a>
+                    <a href="/security-guide/">Security Guide</a>
+                    <a href="/image-guide/content/">Virtual Machine Image Guide</a>
+                    <a href="/arch-design/content/">Architecture Design Guide</a>
                 </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="/admin-guide-cloud/">Cloud Administrator Guide</a>
-                        <a href="/high-availability-guide/content/">High Availability Guide</a>
-                        <a href="/networking-guide/">Networking Guide</a>
-                        <a href="/ops/">Operations Guide</a>
-                        <a href="/security-guide/">Security Guide</a>
-                        <a href="/image-guide/content/">Virtual Machine Image Guide</a>
-                        <a href="/arch-design/content/">Architecture Design Guide</a>
-                    </div>
-                    <div class="docs-link-sections">
-                        <h3 id="user-guides"><i class="fa fa-cloud"></i> User Guides</h3>
-                        <a href="http://developer.openstack.org/api-guide/quick-start/">API Guide</a>
-                        <a href="/user-guide/">End User Guide (includes Python SDK)</a>
-                        <a href="/user-guide-admin/">Admin User Guide</a>
-                        <a href="/cli-reference/content/">Command-Line Interface Reference</a>
-                        <a href="http://developer.openstack.org">Open source software for application development</a>
-                    </div>
-                    {% include 'templates/contributor_guides.tmpl' %}
-                    <div class="docs-link-sections">
-                        <h3 id="training-guides"><i class="fa fa-university"></i> Training Guides</h3>
-                        <a href="/upstream-training/">Upstream training</a>
-                    </div>
+                <div class="docs-link-sections">
+                    <h3 id="user-guides"><i class="fa fa-cloud"></i> User Guides</h3>
+                    <a href="http://developer.openstack.org/api-guide/quick-start/">API Guide</a>
+                    <a href="/user-guide/">End User Guide (includes Python SDK)</a>
+                    <a href="/user-guide-admin/">Admin User Guide</a>
+                    <a href="/cli-reference/content/">Command-Line Interface Reference</a>
+                    <a href="http://developer.openstack.org">Open source software for application development</a>
                 </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://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                {% include 'templates/contributor_guides.tmpl' %}
+                <div class="docs-link-sections">
+                    <h3 id="training-guides"><i class="fa fa-university"></i> Training Guides</h3>
+                    <a href="/upstream-training/">Upstream training</a>
                 </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="https://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+            </div>
+        </div>
+    </div>
 </div>
-    <!-- End Page Content -->
+<!-- End Page Content -->
 {% endblock content %}
diff --git a/www/juno/index.html b/www/juno/index.html
index dded274901..f13014325c 100644
--- a/www/juno/index.html
+++ b/www/juno/index.html
@@ -1,7 +1,7 @@
 {% set scriptdir = '../common/js/' %}
 {% set cssdir = '../common/css/' %}
 {% extends "templates/base.tmpl" %}
-{% block pagetitle %}Current{% endblock %}
+{% block pagetitle %}Juno{% endblock %}
 {% block title %}{% endblock %}
 {% block header %}
 {% endblock header %}
diff --git a/www/kilo/index.html b/www/kilo/index.html
index 23b0efc0db..9e8f247592 100644
--- a/www/kilo/index.html
+++ b/www/kilo/index.html
@@ -1,13 +1,13 @@
 {% set scriptdir = '../common/js/' %}
 {% set cssdir = '../common/css/' %}
 {% extends "templates/base.tmpl" %}
-{% block pagetitle %}Current{% endblock %}
+{% block pagetitle %}Kilo{% endblock %}
 {% block title %}{% endblock %}
 {% block header %}
 {% endblock header %}
 {% block content %}
-    <!-- Begin Page Content -->
-    <div class="top-docs-wrapper">
+<!-- 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">
@@ -21,7 +21,7 @@
                 <a href="http://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
                 <a href="http://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
                 <form class="docs-main-search-form">
-      <script type="text/javascript">
+                    <script type="text/javascript">
         (function() {
         var cx = '000108871792296872333:noj9nikm74i';
         var gcse = document.createElement('script');
@@ -33,105 +33,110 @@
         var s = document.getElementsByTagName('script')[0];
         s.parentNode.insertBefore(gcse, s);
       })();
-       </script>
-       <gcse:search gname="standard" as_sitesearch="docs.openstack.org">
-       </gcse:search>
-       </form>
-       </div>
-        <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-            <div id="superuser-img"></div>
-        </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 Kilo (April 2015)</h2>
-                <p>This is the latest release. Use the menu to select a prior release if needed.</p>
+                    </script>
+                    <gcse:search gname="standard" as_sitesearch="docs.openstack.org">
+                    </gcse:search>
+                </form>
+            </div>
+            <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
+                <div id="superuser-img"></div>
             </div>
-            {% include 'templates/dropdown_releases_and_languages.tmpl' %}
         </div>
     </div>
-</div>
+    <div class="mid-docs-wrapper" id="docs-main-body">
         <div class="container">
             <div class="row">
-                <div class="col-lg-12">
+                <div class="col-lg-9 col-md-9 col-sm-9">
+                    <h2>Documentation for Kilo (April 2015)</h2>
+                    <p>This is the latest release. Use the menu to select a prior release if needed.</p>
+                </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="install-guides"><i class="fa fa-cogs"></i> Install Guides</h3>
+                    <a href="/kilo/install-guide/install/zypper/content/">Installation Guide for openSUSE 13.2 and SUSE Linux Enterprise Server 12</a>
+                    <a href="/kilo/install-guide/install/yum/content/">Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and Fedora 21</a>
+                    <a href="/kilo/install-guide/install/apt/content/">Installation Guide for Ubuntu 14.04 (LTS)</a>
+                </div>
+                <div class="docs-link-sections">
+                    <h3 id="api-guides"><i class="fa fa-book"></i> API References</h3>
+                    <a href="http://developer.openstack.org/api-ref.html">API Complete Reference (HTML)</a>
+                    <a href="http://developer.openstack.org/api-ref-guides/bk-api-ref.pdf">API Complete Reference (PDF)</a>
+                    <a href="http://developer.openstack.org/api-ref-blockstorage-v2.html">Block Storage API v2 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-blockstorage-v1.html">Block Storage API v1 (DEPRECATED)</a>
+                    <a href="http://developer.openstack.org/api-ref-compute-v2.1.html">Compute API v2.1 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-compute-v2.html">Compute API v2 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-compute-v2-ext.html">Compute API v2 extensions (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-data-processing-v1.1.html">Data Processing v1.1 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-database-v1.html">Database Service API v1.0 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-identity-v3.html">Identity API v3 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-identity-v3-ext.html">Identity API v3 extensions (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-identity-v2.html">Identity API v2.0 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-identity-admin-v2.html">Identity Admin API v2.0 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-identity-v2-ext.html">Identity API v2.0 extensions (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-image-v2.html">Image Service API v2 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-image-v1.html">Image Service API v1 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-networking-v2.html">Networking API v2.0 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-networking-v2-ext.html">Networking API v2.0 extensions (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-objectstorage-v1.html">Object Storage API v1 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-orchestration-v1.html">Orchestration API v1 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-share-v2.html">Shared File Systems API v2 (CURRENT)</a>
+                    <a href="http://developer.openstack.org/api-ref-share-v1.html">Shared File Systems API v1 (SUPPORTED)</a>
+                    <a href="http://developer.openstack.org/api-ref-telemetry-v2.html">Telemetry API v2 (CURRENT)</a>
+                </div>
+                <div class="docs-link-sections">
+                    <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
+                    <a href="/arch-design/content/">Architecture Design Guide</a>
+                    <a href="/kilo/config-reference/content/">Configuration Reference</a>
+                    <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
+                    <a href="/high-availability-guide/content/index.html">High Availability Guide</a>
+                    <a href="/ops/">Operations Guide</a>
+                    <a href="/security-guide/">Security Guide</a>
+                    <a href="/image-guide/content/">Virtual Machine Image Guide</a>
                 </div>
             </div>
-            <div class="row docs-toc">
-                <div class="col-lg-6 col-md-6 col-sm-6">
-                    <div class="docs-link-sections">
-                        <h3><i class="fa fa-cogs"></i> Install Guides</h3>
-                        <a href="/kilo/install-guide/install/zypper/content/">Installation Guide for openSUSE 13.2 and SUSE Linux Enterprise Server 12</a>
-                        <a href="/kilo/install-guide/install/yum/content/">Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and Fedora 21</a>
-                        <a href="/kilo/install-guide/install/apt/content/">Installation Guide for Ubuntu 14.04 (LTS)</a>
-                    </div>
-                    <div class="docs-link-sections">
-                        <h3 id="api-guides"><i class="fa fa-book"></i> API References</h3>
-                        <a href="http://developer.openstack.org/api-ref.html">API Complete Reference (HTML)</a>
-                        <a href="http://developer.openstack.org/api-ref-guides/bk-api-ref.pdf">API Complete Reference (PDF)</a>
-                        <a href="http://developer.openstack.org/api-ref-blockstorage-v2.html">Block Storage API v2 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-blockstorage-v1.html">Block Storage API v1 (DEPRECATED)</a>
-                        <a href="http://developer.openstack.org/api-ref-compute-v2.1.html">Compute API v2.1 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-compute-v2.html">Compute API v2 (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-compute-v2-ext.html">Compute API v2 extensions (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-data-processing-v1.1.html">Data Processing v1.1 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-database-v1.html">Database Service API v1.0 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-identity-v3.html">Identity API v3 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-identity-v3-ext.html">Identity API v3 extensions (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-identity-v2.html">Identity API v2.0 (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-identity-admin-v2.html">Identity Admin API v2.0 (SUPPORTED)
-                        <a href="http://developer.openstack.org/api-ref-identity-v2-ext.html">Identity API v2.0 extensions (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-image-v2.html">Image Service API v2 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-image-v1.html">Image Service API v1 (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-networking-v2.html">Networking API v2.0 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-networking-v2-ext.html">Networking API v2.0 extensions (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-objectstorage-v1.html">Object Storage API v1 (SUPPORTED)</a>
-                        <a href="http://developer.openstack.org/api-ref-orchestration-v1.html">Orchestration API v1 (CURRENT)</a>
-                        <a href="http://developer.openstack.org/api-ref-telemetry-v2.html">Telemetry API v2 (CURRENT)</a>
-                    </div>
-                    <div class="docs-link-sections">
-                        <h3><i class="fa fa-wrench"></i> Configuration Guides</h3>
-                        <a href="/arch-design/content/">Architecture Design Guide</a>
-                        <a href="/kilo/config-reference/content/">Configuration Reference</a>
-                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
-                        <a href="/high-availability-guide/content/index.html">High Availability Guide</a>
-                        <a href="/ops/">Operations Guide</a>
-                        <a href="/security-guide/">Security Guide</a>
-                        <a href="/image-guide/content/">Virtual Machine Image Guide</a>
-                    </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="/admin-guide-cloud/">Cloud Administrator Guide</a>
+                    <a href="/high-availability-guide/content/">High Availability Guide</a>
+                    <a href="/networking-guide/">Networking Guide</a>
+                    <a href="/ops/">Operations Guide</a>
+                    <a href="/security-guide/">Security Guide</a>
+                    <a href="/image-guide/content/">Virtual Machine Image Guide</a>
+                    <a href="/arch-design/content/">Architecture Design Guide</a>
                 </div>
-                <div class="col-lg-6 col-md-6 col-sm-6">
-                    <div class="docs-link-sections">
-                        <h3><i class="fa fa-users"></i> Operations and Administration Guides</h3>
-                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
-                        <a href="/high-availability-guide/content/">High Availability Guide</a>
-                        <a href="/ops/">Operations Guide</a>
-                        <a href="/networking-guide/">Networking Guide</a>
-                        <a href="/security-guide/">Security Guide</a>
-                        <a href="/image-guide/content/">Virtual Machine Image Guide</a>
-                        <a href="/arch-design/content/">Architecture Design Guide</a>
-                    </div>
-                    <div class="docs-link-sections">
-                        <h3><i class="fa fa-cloud"></i> User Guides</h3>
-                        <a href="http://developer.openstack.org/api-guide/quick-start/">API Guide</a>
-                        <a href="/user-guide/">End User Guide (includes Python SDK)</a>
-                        <a href="/user-guide-admin/">Admin User Guide</a>
-                        <a href="/cli-reference/content/">Command-Line Interface Reference</a>
-                        <a href="http://developer.openstack.org">Open source software for application development</a>
-                    </div>
-                    {% include 'templates/contributor_guides.tmpl' %}
+                <div class="docs-link-sections">
+                    <h3 id="user-guides"><i class="fa fa-cloud"></i> User Guides</h3>
+                    <a href="http://developer.openstack.org/api-guide/quick-start/">API Guide</a>
+                    <a href="/user-guide/">End User Guide (includes Python SDK)</a>
+                    <a href="/user-guide-admin/">Admin User Guide</a>
+                    <a href="/cli-reference/content/">Command-Line Interface Reference</a>
+                    <a href="http://developer.openstack.org">Open source software for application development</a>
                 </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://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                {% include 'templates/contributor_guides.tmpl' %}
+                <div class="docs-link-sections">
+                    <h3 id="training-guides"><i class="fa fa-university"></i> Training Guides</h3>
+                    <a href="/upstream-training/">Upstream training</a>
                 </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="https://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+            </div>
+        </div>
+    </div>
 </div>
-    <!-- End Page Content -->
+<!-- End Page Content -->
 {% endblock content %}