diff --git a/openstackdocstheme/theme/openstackdocs/layout.html b/openstackdocstheme/theme/openstackdocs/layout.html
index b4c87cca..62a34bed 100644
--- a/openstackdocstheme/theme/openstackdocs/layout.html
+++ b/openstackdocstheme/theme/openstackdocs/layout.html
@@ -39,8 +39,7 @@ ga('send', 'pageview');
           <div class="row">
             <div class="col-lg-12">
               <div class="docs-top-contents">
-                <h5><a href="{{ pathto(master_doc) }}">Contents</a></h5>
-                {{ toc }}
+{% include 'localtoc.html' %}
               </div>
               <div class="docs-body">
 {% block body %}{% endblock %}
diff --git a/openstackdocstheme/theme/openstackdocs/localtoc.html b/openstackdocstheme/theme/openstackdocs/localtoc.html
new file mode 100644
index 00000000..cccd5e36
--- /dev/null
+++ b/openstackdocstheme/theme/openstackdocs/localtoc.html
@@ -0,0 +1,4 @@
+{%- if display_toc %}
+<h5><a href="{{ pathto(master_doc) }}">Contents</a></h5>
+{{ toc }}
+{%- endif %}
diff --git a/openstackdocstheme/theme/openstackdocs/static/css/combined.css b/openstackdocstheme/theme/openstackdocs/static/css/combined.css
index d3b79291..5c6a0ca9 100644
--- a/openstackdocstheme/theme/openstackdocs/static/css/combined.css
+++ b/openstackdocstheme/theme/openstackdocs/static/css/combined.css
@@ -4127,7 +4127,7 @@ a.docs-edit i {
 .docs-top-contents ul {
   list-style: none;
   padding: 3px;
-  margin: 0 0 0 10px; }
+  margin: 0 0 5px 0; }
 
 .docs-top-contents ul li a {
   text-decoration: underline; }
@@ -4641,3 +4641,19 @@ table.highlighttable {
   padding-left: 0px;
   margin-left: 20px;
 }
+
+.docs-body .section h1 {
+  display: none;
+}
+
+.docs-top-contents a[href="#"] {
+  display: none;
+}
+
+.docs-top-contents h5 {
+  margin-bottom: 10px;
+}
+
+.docs-top-contents {
+  padding: 10px;
+}