diff --git a/browser/edit.pt b/browser/edit.pt
index 71f51ae..a8078ab 100644
--- a/browser/edit.pt
+++ b/browser/edit.pt
@@ -21,7 +21,7 @@
       <input type="hidden" name="form_submitted" value="true" />
       <tal:control condition="request/form_submitted|nothing">
         <script language="JavaScript">
-            focusOpener();
+            //focusOpener();
         </script>
       </tal:control>
 
diff --git a/browser/node_macros.pt b/browser/node_macros.pt
index 2ae6e69..5eebb5e 100644
--- a/browser/node_macros.pt
+++ b/browser/node_macros.pt
@@ -103,7 +103,8 @@
                tal:content="item/context/title"
                tal:attributes="href item/url">Menu Text</a>
           </div>
-          <tal:sub tal:define="level python:level+1">
+          <tal:sub define="level python:level+1"
+                   condition="python: level &lt; 4 or view.active(item)">
             <tal:items repeat="item item/menuItems">
               <metal:portlet use-macro="views/node_macros/menu" />
             </tal:items>
diff --git a/browser/target_macros.pt b/browser/target_macros.pt
index e08dbda..29d95ea 100644
--- a/browser/target_macros.pt
+++ b/browser/target_macros.pt
@@ -8,8 +8,9 @@
     <metal:top define-slot="topActions" />
     <form metal:define-macro="listing_form"
           method="post" name="listing" action="."
-          tal:attributes="action request/URL"
-          tal:condition="items">
+          tal:define="target view/target"
+          tal:condition="python: target or items"
+          tal:attributes="action request/URL">
       <input type="hidden" name="action" value="assign"
              tal:attributes="value action" />
       <table class="listing" summary="Currently assigned"
@@ -22,8 +23,7 @@
             <th i18n:translate="label_type">Type</th>
           </tr>
         </thead>
-        <tbody tal:define="target view/target;
-                           targetToken python: target and target.token or None">
+        <tbody tal:define="targetToken python: target and target.token or None">
           <tal:none define="item nothing; title string:None; token nothing;
                             type nothing">
             <metal:none use-macro="views/target_macros/list_item_tr" />