diff --git a/www/index.html b/www/index.html
index 7004689e44..c006c98864 100644
--- a/www/index.html
+++ b/www/index.html
@@ -74,17 +74,17 @@
                     <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>
-                {% include 'templates/api_guides.tmpl' %}
-                <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>
                 <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' %}
diff --git a/www/juno/index.html b/www/juno/index.html
index e5009f75cd..a89c3add66 100644
--- a/www/juno/index.html
+++ b/www/juno/index.html
@@ -69,17 +69,17 @@
                         <a href="/juno/install-guide/install/yum/content/">Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and Fedora 20</a>
                         <a href="/juno/install-guide/install/apt/content/">Installation Guide for Ubuntu 14.04 (LTS)</a>
                     </div>
-                    {% include 'templates/api_guides.tmpl' %}
-                    <div class="docs-link-sections">
-                        <h3><i class="fa fa-wrench"></i> Configuration Guides</h3>
-                        <a href="/juno/config-reference/content/">Configuration Reference</a>
-                        <p>Installation and configuration options for OpenStack</p>
-                    </div>
                     <div class="docs-link-sections">
                         {% include 'templates/ops_and_admin_guides.tmpl' %}
                         <a href="/kilo/networking-guide/">Networking Guide</a>
                         <p>Deploy and manage OpenStack Networking (neutron)</p>
                     </div>
+                    <div class="docs-link-sections">
+                        <h3><i class="fa fa-wrench"></i> Configuration Guides</h3>
+                        <a href="/juno/config-reference/content/">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' %}
diff --git a/www/kilo/index.html b/www/kilo/index.html
index 5c48d8a24b..93c2178c68 100644
--- a/www/kilo/index.html
+++ b/www/kilo/index.html
@@ -68,17 +68,17 @@
                     <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>
-                {% include 'templates/api_guides.tmpl' %}
-                <div class="docs-link-sections">
-                    <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-                    <a href="/kilo/config-reference/content/">Configuration Reference</a>
-                    <p>Installation and configuration options for OpenStack</p>
-                </div>
                 <div class="docs-link-sections">
                     {% include 'templates/ops_and_admin_guides.tmpl' %}
                     <a href="/kilo/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="/kilo/config-reference/content/">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' %}
diff --git a/www/liberty/index.html b/www/liberty/index.html
index 404e0f829b..9c11990884 100644
--- a/www/liberty/index.html
+++ b/www/liberty/index.html
@@ -73,17 +73,17 @@
                     <a href="/liberty/install-guide-rdo/">Installation Guide for Red Hat Enterprise Linux 7 and CentOS 7</a>
                     <a href="/liberty/install-guide-ubuntu/">Installation Guide for Ubuntu 14.04 (LTS)</a>
                 </div>
-                {% include 'templates/api_guides.tmpl' %}
-                <div class="docs-link-sections">
-                    <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
-                    <a href="/liberty/config-reference/content/">Configuration Reference</a>
-                    <p>Installation and configuration options for OpenStack</p>
-                </div>
                 <div class="docs-link-sections">
                     {% include 'templates/ops_and_admin_guides.tmpl' %}
                     <a href="/liberty/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="/liberty/config-reference/content/">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' %}
diff --git a/www/mitaka/index.html b/www/mitaka/index.html
index ba4cef4ff3..fa4187b3d3 100644
--- a/www/mitaka/index.html
+++ b/www/mitaka/index.html
@@ -74,17 +74,17 @@
                     <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>
-                {% include 'templates/api_guides.tmpl' %}
-                <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>
                 <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' %}
diff --git a/www/templates/user_guides.tmpl b/www/templates/user_guides.tmpl
index 2a07560f93..2726620dd8 100644
--- a/www/templates/user_guides.tmpl
+++ b/www/templates/user_guides.tmpl
@@ -1,10 +1,7 @@
                 <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>
-                    <p>Introduction to using the OpenStack API</p>
                     <a href="/user-guide/">End User Guide (includes Python SDK)</a>
                     <p>Create and manage resources using the OpenStack dashboard, command-line client, and Python SDK</p>
-                    <p>Manage projects, images, and users in an OpenStack environment</p>
                     <a href="/cli-reference/">Command-Line Interface Reference</a>
                     <p>Comprehensive OpenStack command-line reference</p>
                     <a href="http://developer.openstack.org">Open source software for application development</a>