diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index e3b2795..69c492c 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -1,4 +1,4 @@
-.. _`configuration`:
+.. _configuration:
 
 =============
 Configuration
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
index d1e2865..46b424a 100644
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@@ -1,4 +1,4 @@
-.. `contributing`:
+.. _contributing:
 
 ============
 Contributing
diff --git a/doc/source/devref.rst b/doc/source/devref.rst
index 7a2c23d..988e138 100644
--- a/doc/source/devref.rst
+++ b/doc/source/devref.rst
@@ -1,4 +1,4 @@
-.. _`developer guide`:
+.. _developer guide:
 
 ===============
 Developer Guide
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 0c0f0fa..9d6f820 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -43,6 +43,35 @@ by separate Nova virtualization drivers:
   `openstack/nova-zvm-virt-driver <http://git.openstack.org/cgit/openstack/nova-zvm-virt-driver>`_
   project.
 
+Overview
+========
+
+.. toctree::
+    :maxdepth: 2
+
+    releasenotes/source/unreleased
+    topology
+    support-matrix
+
+Using the driver
+================
+
+.. toctree::
+    :maxdepth: 2
+
+    installation
+    configuration
+
+Contributing to the project
+===========================
+
+.. toctree::
+    :maxdepth: 2
+
+    contributing
+    devref
+    specs/ocata/index
+
 Links
 =====
 
@@ -51,34 +80,3 @@ Links
 * Github shadow: `<https://github.com/openstack/nova-dpm>`_
 * Bugs: `<http://bugs.launchpad.net/nova-dpm>`_
 * Gerrit: `<https://review.openstack.org/#/q/project:openstack/nova-dpm>`_
-
-Overview
-========
-
-.. toctree::
-    :maxdepth: 1
-
-    releasenotes/source/unreleased
-    topology
-
-Using the nova-dpm driver
-=========================
-
-.. toctree::
-    :maxdepth: 1
-
-    installation
-    configuration
-    support-matrix
-
-Contributing to the nova-dpm project
-====================================
-
-.. toctree::
-    :glob:
-    :maxdepth: 1
-
-    contributing
-    devref
-    specs/ocata/index
-
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 1d0a89e..4c1e8ee 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -1,4 +1,4 @@
-.. _`installation`:
+.. _installation:
 
 ============
 Installation
diff --git a/doc/source/support-matrix.rst b/doc/source/support-matrix.rst
index 3aec40c..f1ab83b 100644
--- a/doc/source/support-matrix.rst
+++ b/doc/source/support-matrix.rst
@@ -1,4 +1,4 @@
-.. `feature support matrix`:
+.. _feature support matrix:
 
 ======================
 Feature Support Matrix