diff --git a/browser/mojo/base.css b/browser/mojo/base.css
index 28e3a87..89cb373 100644
--- a/browser/mojo/base.css
+++ b/browser/mojo/base.css
@@ -15,7 +15,12 @@ body, html {
     color: #000040;
 }
 
-#borderContainer {
+h1, h2, h3, h4 {
+    margin-top: 0;
+    padding-top: 0;
+}
+
+#main_container {
     width: 100%;
     height: 100%;
 }
diff --git a/browser/mojo/body.pt b/browser/mojo/body.pt
index 9dc0236..1be52f9 100644
--- a/browser/mojo/body.pt
+++ b/browser/mojo/body.pt
@@ -3,7 +3,7 @@
              tal:define="controller nocall:view/controller;
                          resourceBase controller/resourceBase;">
 
-    <div id="borderContainer"
+    <div id="main_container"
          dojoType="dijit.layout.BorderContainer"
          gutters="true">
 
@@ -18,17 +18,15 @@
         </div>
       </div>
 
-      <div id="mainSplit"
-           dojoType="dijit.layout.BorderContainer"
+      <div dojoType="dijit.layout.BorderContainer"
            region="center" gutters="true" design="sidebar"
-           splitter="false" liveSplitters="true">
+           splitter="false" liveSplitters="true"
+           tal:define="item nocall:view/targetItem">
         <div metal:define-macro="menu"
              dojoType="dijit.layout.ContentPane"
              region="leading" splitter="true"
-             style="width: 15%">
-          <tal:portlet repeat="macro controller/macros/portlet_left">
-            <metal:portlet use-macro="macro" />
-          </tal:portlet>
+             style="width: 20%">
+          <metal:portlet use-macro="item/navigation_macro" />
         </div>
         <div metal:define-macro="content"
              dojoType="dijit.layout.ContentPane"
@@ -36,8 +34,7 @@
           <div metal:define-slot="actions"></div>
           <div metal:define-slot="message"></div>
           <metal:content define-slot="content">
-            <tal:content define="item nocall:view/item;
-                                 level level|python: 1;
+            <tal:content define="level level|python: 1;
                                  macro item/macro;"
                          condition="macro">
               <metal:block use-macro="macro" />
@@ -51,7 +48,7 @@
            region="bottom" splitter="false"
            style="margin-top: 0">
         <metal:footer define-slot="footer">
-          Powered by <b><a href="http://www.python.org">Python</a></b> &middot;
+          Powered by 
           <b><a href="http://loops.cy55.de">loops</a></b> &middot;
           <b><a href="http://wiki.zope.org/zope3">Zope 3</a></b> &middot;
           <b><a href="http://www.python.org">Python</a></b> &middot;