diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7b1055643b..b9a7335963 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -331,10 +331,6 @@ epub_copyright = u'2014, OpenStack Octavia Team'
 policy_generator_config_file = '../../etc/policy/octavia-policy-generator.conf'
 sample_policy_basename = 'configuration/_static/octavia'
 
-# openstackdocstheme options
-html_theme_options = {
-    'display_toc': False
-}
 repository_name = 'openstack/octavia'
 bug_project = '908'
 bug_tag = 'docs'
diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index 786ccf7a2b..3020011863 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -2,15 +2,42 @@
 Octavia User
 ============
 
+Cookbooks
+=========
 .. toctree::
    :glob:
    :maxdepth: 1
 
+   guides/basic-cookbook
+   guides/l7-cookbook
+   guides/basic-cookbook-neutron
+   guides/l7-cookbook-neutron
+
+Guides
+======
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   guides/l7
+
+References
+==========
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   Octavia API Reference <https://developer.openstack.org/api-ref/load-balancer/>
    Command Line Interface Reference <https://docs.openstack.org/python-octaviaclient/latest/cli/index.html>
+   sdks
 
-   guides/*
+Videos
+======
+.. toctree::
+   :glob:
+   :maxdepth: 1
 
-   sdks.rst
+   Introduction to OpenStack Load Balancing (2017 Boston Summit) <https://youtu.be/BBgP3_qhJ00>
 
 Indices and Search
 ------------------