diff --git a/developer_manual/android_library/index.rst b/developer_manual/android_library/index.rst
index 8845e274f..534803c01 100644
--- a/developer_manual/android_library/index.rst
+++ b/developer_manual/android_library/index.rst
@@ -23,7 +23,7 @@ You might want to start with doing one or two `junior jobs <https://github.com/o
 to get into the code!
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
    :hidden:
 
    library_installation
diff --git a/developer_manual/app/index.rst b/developer_manual/app/index.rst
index 189119071..74cb7a44f 100644
--- a/developer_manual/app/index.rst
+++ b/developer_manual/app/index.rst
@@ -4,7 +4,7 @@
 
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
    :hidden:
 
    startapp
diff --git a/developer_manual/bugtracker/index.rst b/developer_manual/bugtracker/index.rst
index 98ea5257f..41ff8d941 100644
--- a/developer_manual/bugtracker/index.rst
+++ b/developer_manual/bugtracker/index.rst
@@ -3,7 +3,7 @@ Bugtracker
 ==========
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
    :hidden:
 
    codereviews
diff --git a/developer_manual/commun/index.rst b/developer_manual/commun/index.rst
index ee564fb46..ee08342b8 100644
--- a/developer_manual/commun/index.rst
+++ b/developer_manual/commun/index.rst
@@ -3,7 +3,7 @@ Help and Communication
 ======================
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
 Mailing lists
 -------------
diff --git a/developer_manual/contents.rst b/developer_manual/contents.rst
index 372a65658..fd33e6a5a 100644
--- a/developer_manual/contents.rst
+++ b/developer_manual/contents.rst
@@ -1,25 +1,44 @@
 .. _contents:
 
-===============================
-ownCloud documentation contents
-===============================
+================================
+ownCloud Developer Documentation
+================================
+
+If you want to contribute please read the `Contributor agreement 
+<http://owncloud.org/about/contributor-agreement/>`_
+
++-------------------------+-------------------------+-----------------------------+
+|:doc:`app/index`         |:doc:`core/index`        |`Documentation`_             |
+| Develop apps for        | Develop on the ownCloud | Create and enhance          |
+| ownCloud and publish on | internals               | documentation               |
+| the `ownCloud appstore`_|                         |                             |
++-------------------------+-------------------------+-----------------------------+
+|:doc:`testing/index`     |:doc:`bugtracker/index`  |`Translation`_               |
+| Help us to test         | Report, triage or fix   | Translate ownCloud into     |
+| ownCloud by joining the | bugs to improve quality | your language               |
+| testing team            |                         |                             |
++-------------------------+-------------------------+-----------------------------+
+|:doc:`commun/index`      | :doc:`ios_library/index`|:doc:`android_library/index` |      
+| Help on IRC, the        |  Integration with iOS   | Integrating with Android    |
+| mailinglist and forum   |                         |                             |
++-------------------------+-------------------------+-----------------------------+
+
+.. _ownCloud appstore: http://apps.owncloud.com/
+.. _Translation: https://www.transifex.com/projects/p/owncloud/
+.. _Documentation: https://github.com/owncloud/documentation#owncloud-documentation
+
+Table of Contents
+=================
 
 .. toctree::
-    :hidden:
-
-    index
-
-.. toctree::
-    :maxdepth: 3
+    :maxdepth: 2
 
     general/index
     app/index
+    android_library/index
+    ios_library/index
     core/index
     testing/index
     bugtracker/index
     commun/index
-
-Indices and tables
-==================
-
-* :ref:`genindex`
+     
\ No newline at end of file
diff --git a/developer_manual/core/index.rst b/developer_manual/core/index.rst
index 8a59ad1e4..147c4769e 100644
--- a/developer_manual/core/index.rst
+++ b/developer_manual/core/index.rst
@@ -2,7 +2,7 @@
 
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
    :hidden:
 
    translation
diff --git a/developer_manual/general/index.rst b/developer_manual/general/index.rst
index 0343d06c7..f7cc21269 100644
--- a/developer_manual/general/index.rst
+++ b/developer_manual/general/index.rst
@@ -1,9 +1,9 @@
-=======
-General
-=======
+==============================
+General Contributor Guidelines
+==============================
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
    code-of-conduct
    devenv
diff --git a/developer_manual/index.rst b/developer_manual/index.rst
index 917b0ad6d..18b261b1b 100644
--- a/developer_manual/index.rst
+++ b/developer_manual/index.rst
@@ -1,37 +1,28 @@
 .. _index:
 
-=======================
-Developer Documentation
-=======================
+================================
+ownCloud Developer Documentation
+================================
 
-If you want to contribute please read the `Contributor agreement <http://owncloud.org/about/contributor-agreement/>`_
+If you want to contribute please read the `Contributor agreement 
+<http://owncloud.org/about/contributor-agreement/>`_
 
-+-------------------------+-------------------------+--------------------------+
-|:doc:`app/index`         |:doc:`core/index`        |`Documentation`_          |
-| Develop apps for        | Develop on the ownCloud | Create and enhance       |
-| ownCloud and publish on | internals               | documentation            |
-| the `ownCloud appstore`_|                         |                          |
-+-------------------------+-------------------------+--------------------------+
-|:doc:`testing/index`     |:doc:`bugtracker/index`  |`Translation`_            |
-| Help us to test         | Report, triage or fix   | Translate ownCloud into  |
-| ownCloud by joining the | bugs to improve quality | your language            |
-| testing team            |                         |                          |
-|                         |                         |                          |
-|                         |                         |                          |
-+-------------------------+-------------------------+--------------------------+
-|:doc:`commun/index`      |                         |                          |
-| Help on IRC, the        |                         |                          |
-| mailinglist and forum   |                         |                          |
-+-------------------------+-------------------------+--------------------------+
++-------------------------+-------------------------+-----------------------------+
+|:doc:`app/index`         |:doc:`core/index`        |`Documentation`_             |
+| Develop apps for        | Develop on the ownCloud | Create and enhance          |
+| ownCloud and publish on | internals               | documentation               |
+| the `ownCloud appstore`_|                         |                             |
++-------------------------+-------------------------+-----------------------------+
+|:doc:`testing/index`     |:doc:`bugtracker/index`  |`Translation`_               |
+| Help us to test         | Report, triage or fix   | Translate ownCloud into     |
+| ownCloud by joining the | bugs to improve quality | your language               |
+| testing team            |                         |                             |
++-------------------------+-------------------------+-----------------------------+
+|:doc:`commun/index`      | :doc:`ios_library/index`|:doc:`android_library/index` |      
+| Help on IRC, the        |  Integration with iOS   | Integrating with Android    |
+| mailinglist and forum   |                         |                             |
++-------------------------+-------------------------+-----------------------------+
 
 .. _ownCloud appstore: http://apps.owncloud.com/
 .. _Translation: https://www.transifex.com/projects/p/owncloud/
 .. _Documentation: https://github.com/owncloud/documentation#owncloud-documentation
-
-Index and Tables
-================
-* :ref:`genindex`
-* :ref:`modindex`
-
-
-
diff --git a/developer_manual/ios_library/examples.rst b/developer_manual/ios_library/examples.rst
index 26f921c77..76aaf06f3 100644
--- a/developer_manual/ios_library/examples.rst
+++ b/developer_manual/ios_library/examples.rst
@@ -364,7 +364,7 @@ Code example
 
 
 Download a file with background session
--------------------------------------
+---------------------------------------
 
 Download an existing file storaged on the cloud server using background session, only supported by iOS 7 and higher. 
 
@@ -433,7 +433,7 @@ Code example
 
 
 Set callback when background download task finishes
------------------------------------------
+---------------------------------------------------
 
 Method to set callbacks of the pending download transfers when the app starts. It's used when there are pendings download background transfers. The block is executed when a pending background task finishes.
 
@@ -448,7 +448,7 @@ Code example
     }];
 
 Set progress callback with pending background download tasks
----------------------------------------------------
+------------------------------------------------------------
 
 Method to set progress callbacks of the pending download transfers. It's used when there are pendings background download transfers. The block is executed when a pending task get a input porgress.
 
diff --git a/developer_manual/ios_library/index.rst b/developer_manual/ios_library/index.rst
index 849bfee7a..d2a834607 100644
--- a/developer_manual/ios_library/index.rst
+++ b/developer_manual/ios_library/index.rst
@@ -17,7 +17,7 @@ examples in Xcode 5.
 .. _iosindex:
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
    :hidden:
 
    library_installation
diff --git a/developer_manual/testing/index.rst b/developer_manual/testing/index.rst
index 9c0d4798c..40cb7132a 100644
--- a/developer_manual/testing/index.rst
+++ b/developer_manual/testing/index.rst
@@ -3,7 +3,7 @@ ownCloud Test Pilots
 ====================
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
    :hidden: