diff --git a/doc/source/conf.py b/doc/source/conf.py
index 2e6df4ab..59574c27 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -111,7 +111,9 @@ html_theme = 'openstackdocs'
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+    "sidebar_mode": "toc"
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 4b7e42e5..52253324 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -4,7 +4,8 @@
 Block Storage Service Specifications (cinder)
 =============================================
 
-Ussuri approved specs:
+Ussuri approved specs
+=====================
 
 .. any patch adding a spec should remove the following line:
 
@@ -16,7 +17,8 @@ Ussuri approved specs:
 
    specs/ussuri/*
 
-Train approved specs:
+Train approved specs
+====================
 
 .. toctree::
    :glob:
@@ -24,7 +26,8 @@ Train approved specs:
 
    specs/train/*
 
-Stein approved specs:
+Stein approved specs
+====================
 
 .. toctree::
    :glob:
@@ -32,7 +35,8 @@ Stein approved specs:
 
    specs/stein/*
 
-Rocky approved specs:
+Rocky approved specs
+====================
 
 .. toctree::
    :glob:
@@ -40,7 +44,8 @@ Rocky approved specs:
 
    specs/rocky/*
 
-Queens approved specs:
+Queens approved specs
+=====================
 
 .. toctree::
    :glob:
@@ -48,7 +53,8 @@ Queens approved specs:
 
    specs/queens/*
 
-Pike approved specs:
+Pike approved specs
+===================
 
 .. toctree::
    :glob:
@@ -56,7 +62,8 @@ Pike approved specs:
 
    specs/pike/*
 
-Ocata approved specs:
+Ocata approved specs
+====================
 
 .. toctree::
    :glob:
@@ -64,7 +71,8 @@ Ocata approved specs:
 
    specs/ocata/*
 
-Newton approved specs:
+Newton approved specs
+=====================
 
 .. toctree::
    :glob:
@@ -72,7 +80,8 @@ Newton approved specs:
 
    specs/newton/*
 
-Mitaka approved specs:
+Mitaka approved specs
+=====================
 
 .. toctree::
    :glob:
@@ -80,7 +89,8 @@ Mitaka approved specs:
 
    specs/mitaka/*
 
-Liberty approved specs:
+Liberty approved specs
+======================
 
 .. toctree::
    :glob:
@@ -88,7 +98,8 @@ Liberty approved specs:
 
    specs/liberty/*
 
-Kilo approved specs:
+Kilo approved specs
+===================
 
 .. toctree::
    :glob:
@@ -96,7 +107,8 @@ Kilo approved specs:
 
    specs/kilo/*
 
-Juno approved specs:
+Juno approved specs
+===================
 
 .. toctree::
    :glob:
@@ -104,7 +116,8 @@ Juno approved specs:
 
    specs/juno/*
 
-Untargeted Specs:
+Untargeted specs
+================
 
 .. note::