diff --git a/docs/development.rst b/docs/development.rst
index 737e00d67..a5556eb10 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -1,3 +1,5 @@
+.. _development:
+
 Development
 ===========
 
diff --git a/docs/gym.rst b/docs/gym.rst
index c7465a049..65cd5ec21 100644
--- a/docs/gym.rst
+++ b/docs/gym.rst
@@ -1,3 +1,5 @@
+.. _gym:
+
 Gym admnistration
 =================
 
diff --git a/docs/i18n.rst b/docs/i18n.rst
index d29522d72..e6bb17315 100644
--- a/docs/i18n.rst
+++ b/docs/i18n.rst
@@ -1,8 +1,9 @@
+.. _i18n:
+
 Internationalization (i18n)
 ===========================
 
 
-
 Updating the translation files
 ------------------------------
 
diff --git a/docs/index.rst b/docs/index.rst
index fa9410792..c07ee8d5b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,23 +21,24 @@ This documentation is intended for developers and administrators of the software
 
 Installation and development
 ----------------------------
+.. toctree::
+   :maxdepth: 2
 
-* :doc:`install`
+   development
+   install
+   commands
+   i18n
 
-  * :doc:`commands`
-  * :doc:`i18n`
-  * :doc:`settings`
-
-* :doc:`development`
 
 
 Administration guide
 --------------------
-* :doc:`gym`
-
 .. toctree::
    :maxdepth: 2
 
+   settings
+   gym
+
 
 Contact
 -------
@@ -81,5 +82,5 @@ Indices and tables
 
 * :ref:`genindex`
 * :ref:`search`
-.. * :ref:`modindex`
+* :ref:`modindex`
 
diff --git a/docs/install.rst b/docs/install.rst
index 5632646af..732350122 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -1,5 +1,7 @@
-Installation
-============
+.. _install:
+
+Installation (production)
+=========================
 
 This file gives a broad description of the necessary steps to install wger on a
 production environment with apache as a webserver. Since this is a regular
@@ -127,6 +129,7 @@ Edit your ``settings.py`` file and set the database, ``SITE_URL``,
 
 Run the installation scritpt, this will load all initial data (exit after it
 is done and tries to start a web browser)::
+
   python start.py
 
 
diff --git a/docs/settings.rst b/docs/settings.rst
index b41f5d8c0..d2494477b 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1,3 +1,5 @@
+.. _settings:
+
 Settings
 ========