diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst
index 00ee757..19ef042 100644
--- a/docs/INSTALL.rst
+++ b/docs/INSTALL.rst
@@ -1,3 +1,5 @@
+.. _Getting Started with ndn-cxx:
+
 Getting started with ndn-cxx
 ============================
 
diff --git a/docs/RELEASE_NOTES.rst b/docs/RELEASE_NOTES.rst
index 104c9d5..886ca98 100644
--- a/docs/RELEASE_NOTES.rst
+++ b/docs/RELEASE_NOTES.rst
@@ -1,3 +1,5 @@
+.. _ndn-cxx v0.1.0 Release Notes:
+
 ndn-cxx v0.1.0 Release Notes
 ============================
 
diff --git a/docs/index.rst b/docs/index.rst
index 2c611c9..9cd0035 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -25,9 +25,11 @@
 ndn-cxx Documentation
 ---------------------
 
-- `API documentation (doxygen) <doxygen/annotated.html>`_
 
 .. toctree::
+   :hidden:
+   :maxdepth: 2
+
    RELEASE_NOTES
    INSTALL
    examples
@@ -36,7 +38,27 @@
    tutorials/security-validator-config
    manpages
    code-style
-   :maxdepth: 1
+
+- `API documentation (doxygen) <doxygen/annotated.html>`_
+
+- :doc:`ndn-cxx v0.1.0 Release Notes <RELEASE_NOTES>`
+
+- :doc:`Getting Started with ndn-cxx <INSTALL>`
+
+- :doc:`Tutorial Examples <examples>`
+
+- :doc:`tutorials/security-library`
+
+- :doc:`tutorials/utils-ndn-regex`
+
+- :doc:`tutorials/security-validator-config`
+
+- :doc:`manpages`
+
+Documentation for ndn-cxx contributors
+++++++++++++++++++++++++++++++++++++++
+
+- :doc:`code-style`
 
 License
 -------
diff --git a/docs/named_data_theme/layout.html b/docs/named_data_theme/layout.html
index 0dc8b44..9f186e4 100644
--- a/docs/named_data_theme/layout.html
+++ b/docs/named_data_theme/layout.html
@@ -36,8 +36,13 @@
         <div class="sidebar">
           {%- block sidebartoc %}
           <h3>{{ _('Table Of Contents') }}</h3>
-          {{ toctree() }}
+          <ul>
+            <li class="toctree-l1"><a class="reference internal" href="doxygen/annotated.html">API documentation (doxygen)</a></li>
+          </ul>
+
+          {{ toctree(includehidden=True) }}
           {%- endblock %}
+
           {%- block sidebarsearch %}
           <h3 style="margin-top: 1.5em;">{{ _('Search') }}</h3>
           <form class="search" action="{{ pathto('search') }}" method="get">
diff --git a/docs/named_data_theme/named_data_header.html b/docs/named_data_theme/named_data_header.html
index d9cb50b..c84397c 100644
--- a/docs/named_data_theme/named_data_header.html
+++ b/docs/named_data_theme/named_data_header.html
@@ -32,7 +32,7 @@
 
          <!--top menu-->
          <div class="nine columns" id="menu_container" >
-           <h1><a href="#">$projectname documentation</a></h1>
+           <h1><a href="http://named-data.net/doc/ndn-cxx/$projectnumber/">$projectname $projectnumber documentation</a></h1>
          </div>
     </div>
 </div><!--header container end-->