diff --git a/doc/themes/triqs/layout.html b/doc/themes/triqs/layout.html
index 8940a7fb..ac29452c 100644
--- a/doc/themes/triqs/layout.html
+++ b/doc/themes/triqs/layout.html
@@ -15,10 +15,9 @@
 {% block sidebar2 %}{% endblock %}
 
 {% block extrahead %}
-    <link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,700'
-          rel='stylesheet' type='text/css'>
-    <script src="_static/cufon-yui.js" type="text/javascript"></script>
-    <script src="_static/spaceman.cufonfonts.js" type="text/javascript"></script>
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,700' rel='stylesheet' type='text/css'>
+    <script src="{{ pathto('_static/cufon-yui.js',1) }}" type="text/javascript"></script>
+    <script src="{{ pathto('_static/spaceman.cufonfonts.js',1) }}" type="text/javascript"></script>
     <script type="text/javascript">
       Cufon.replace('.triqs', { fontFamily: 'spaceman', hover: true }); 
     </script>
@@ -35,7 +34,12 @@
 {% endblock %}
 
 {% block rootrellink %}
+      {% if hasdoc('index') %}
+        <li><a href="{{ pathto('index') }}">Home</a>&nbsp;|</li>
         <li><a href="{{ pathto('contents') }}">Documentation</a> &raquo;</li>
+      {% else %}
+        <li><a href="{{ pathto('contents') }}">Documentation</a> &raquo;</li>
+      {% endif %}
 {% endblock %}
 
 {% block header %}
@@ -46,7 +50,11 @@
     <li><a href="{{ pathto('authors') }}">Authors and Quote</a></li>
   </ul>
   <div>
+    {% if hasdoc('index') %}
+    <h1 style="padding:0; margin: 10px 0 0 0;"><a class="triqs" href="{{ pathto('index') }}">TRIQS</a></h1>
+    {% else %}
     <h1 style="padding:0; margin: 10px 0 0 0;"><a class="triqs" href="{{ pathto('contents') }}">TRIQS</a></h1>
+    {% endif %}
     <span style="font-size: 14px; margin: 0px; padding: 0px;">a Toolbox for Research on Interacting Quantum Systems</span>
   </div>
 </div>