diff --git a/doc/source/_templates/localtoc.html b/doc/source/_templates/localtoc.html
new file mode 100644
index 00000000..3a26d6fa
--- /dev/null
+++ b/doc/source/_templates/localtoc.html
@@ -0,0 +1,8 @@
+{% if pagename != 'index' %}
+
+  {%- if display_toc %}
+    <h3>Contents</h3>
+    {{ toc }}
+  {%- endif %}
+
+{% endif %}
diff --git a/doc/source/_templates/navigation.html b/doc/source/_templates/navigation.html
new file mode 100644
index 00000000..587d95a1
--- /dev/null
+++ b/doc/source/_templates/navigation.html
@@ -0,0 +1,12 @@
+{%- block navigation %}
+
+  {% if pagename != 'index' %}
+    <h3>Navigation</h3>
+    <p>
+    <a href="{{ pathto(master_doc) }}">Documentation Home</a>
+    </p>
+    <p>&nbsp;</p>
+  {% endif %}
+
+
+{%- endblock %}
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5bc957ba..7b3ed3c9 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -151,9 +151,9 @@ html_static_path = ['_static']
 
 # Custom sidebar templates, maps document names to template names.
 html_sidebars = {
-   '**': ['localtoc.html',
+   '**': ['navigation.html',
+          'localtoc.html',
           'relations.html',
-          'sourcelink.html',
           'versions.html',
           'searchbox.html'],
 }
diff --git a/doc/source/themes/agogo/layout.html b/doc/source/themes/agogo/layout.html
index 0e18ba22..3ba13ef2 100644
--- a/doc/source/themes/agogo/layout.html
+++ b/doc/source/themes/agogo/layout.html
@@ -17,7 +17,7 @@
         {%- block headertitle %}
 
         {%- if logo %}
-          <div class="logo"><a href="{{ pathto(master_doc) }}">
+          <div class="logo"><a href="http://scikits-image.org">
             <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
           </a></div>
         {%- endif %}