diff --git a/browser/common.py b/browser/common.py
index ab60826..1275df8 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -182,7 +182,7 @@ class BaseView(GenericView):
     @Lazy
     def inlineEditingActive(self):
         #return False
-        return self.request.principal.id == 'rootadmin'
+        #return self.request.principal.id == 'rootadmin'
         # this may depend on system and user settings...
         return True
 
diff --git a/browser/node_macros.pt b/browser/node_macros.pt
index 935d09e..2801082 100644
--- a/browser/node_macros.pt
+++ b/browser/node_macros.pt
@@ -30,14 +30,14 @@
                    tal:condition="item/xeditable | nothing">
                 <a href="#" title="Edit" style="padding: 5px"
                    tal:attributes="href string:${item/realTargetUrl}/external_edit;
-                                   title string:Edit ${item/title}"><img
+                                   title string:Edit '${target/title}' with External Editor"><img
                               src="edit.gif" alt="Edit"
                               tal:attributes="src context/++resource++edit.gif" /></a>
               </div>
               <div class="subcolumn" id="inlineedit_icon"
                    tal:condition="item/inlineEditable">
                 <a href="#" title="Edit" style="padding: 5px"
-                   tal:attributes="title string:Edit ${item/title};
+                   tal:attributes="title string:Edit '${target/title}' with Inline Editor;
                                    onclick python: item.inlineEdit(id)"><img
                               src="edit.gif" alt="Edit"
                               tal:attributes="src context/++resource++edit.gif" /></a>
diff --git a/browser/resource_macros.pt b/browser/resource_macros.pt
index 23e5585..c7180af 100644
--- a/browser/resource_macros.pt
+++ b/browser/resource_macros.pt
@@ -3,7 +3,8 @@
     <h3 tal:content="item/title">Title</h3>
     <tal:body define="itemNum view/itemNum;
                       id string:$itemNum.body;">
-      <tal:edit define="item nocall:view">
+      <tal:edit define="target nocall:item;
+                        item nocall:view;">
         <div metal:use-macro="views/node_macros/editicons" />
       </tal:edit>
       <div class="content-1" id="1.body"
diff --git a/search/search.pt b/search/search.pt
index 250a91b..297c368 100644
--- a/search/search.pt
+++ b/search/search.pt
@@ -20,7 +20,7 @@
             <tal:block repeat="search_param python: ['type', 'text']">
               <metal:row use-macro="macros/search_row" />
             </tal:block>
-            <tr>
+            <tr tal:condition="nothing">
               <td colspan="2">
                 <input type="button" value="Add concept filter" class="button" />
                 <input type="button" value="Add attribute filter" class="button" />
@@ -62,7 +62,7 @@
                 namePrefix string:search.$rowNum;
                 param search_param | item/searchParam"
     tal:attributes="id string:$idPrefix.row">
-  <td style="width: 30px">
+  <td>
     <input type="hidden" name="paramtype" value="type"
            tal:attributes="name string:$namePrefix.paramtype;
                            value param" />
@@ -92,7 +92,8 @@
       </tal:types>
     </select>
     <input type="button" value="+"
-           title="Add type" />&nbsp;
+           title="Add type"
+           tal:condition="nothing" />&nbsp;
   </div>
 </metal:text>
 
@@ -118,7 +119,8 @@
            tal:attributes="name string:$namePrefix.text;
                            id string:$idPrefix.text;" />
     <input type="button" value="+"
-           title="Add search word" />&nbsp;
+           title="Add search word"
+           tal:condition="nothing" />&nbsp;
   </div>
 </metal:text>