diff --git a/browser/icons/application_edit.png b/browser/icons/application_edit.png
new file mode 100644
index 0000000..fb2efb8
Binary files /dev/null and b/browser/icons/application_edit.png differ
diff --git a/browser/icons/page_edit.png b/browser/icons/page_edit.png
new file mode 100644
index 0000000..046811e
Binary files /dev/null and b/browser/icons/page_edit.png differ
diff --git a/browser/icons/report_edit.png b/browser/icons/report_edit.png
new file mode 100644
index 0000000..c61a6d8
Binary files /dev/null and b/browser/icons/report_edit.png differ
diff --git a/browser/icons/vcard_edit.png b/browser/icons/vcard_edit.png
new file mode 100644
index 0000000..ab0f6e7
Binary files /dev/null and b/browser/icons/vcard_edit.png differ
diff --git a/browser/liquid/body.pt b/browser/liquid/body.pt
index 4348d89..e223acb 100644
--- a/browser/liquid/body.pt
+++ b/browser/liquid/body.pt
@@ -19,14 +19,18 @@
     </div>
 
     <div id="menu" metal:define-macro="menu">
-      <tal:portlet repeat="macro controller/macros/portlet_left">
-        <metal:portlet use-macro="macro" />
-      </tal:portlet>
+      <metal:left define-slot="portlet-left">
+        <tal:portlet repeat="macro controller/macros/portlet_left">
+          <metal:portlet use-macro="macro" />
+        </tal:portlet>
+      </metal:left>
     </div>
 
     <div id="content" metal:define-macro="content">
-      <div metal:define-slot="actions"></div>
-      <div metal:define-slot="message"></div>
+      <div metal:define-slot="breadcrumbs" />
+      <div metal:define-slot="actions" />
+      <div metal:define-slot="message" />
+      <div metal:define-slot="view_modes" />
       <metal:content define-slot="content">
         <tal:content define="item nocall:view/item;
                              level level|python: 1;
@@ -37,11 +41,10 @@
       </metal:content>
     </div>
 
-    <div id="sub-section"
-         xtal:condition="view/isAuthenticated">
-      <tal:portlet repeat="macro controller/macros/portlet_right">
-        <metal:portlet use-macro="macro" />
-      </tal:portlet>
+    <div id="sub-section" metal:define-slot="portlet-right">
+        <tal:portlet repeat="macro controller/macros/portlet_right">
+          <metal:portlet use-macro="macro" />
+        </tal:portlet>
     </div>
 
     <div id="footer" class="footer" metal:define-macro="footer">