diff --git a/browser/form.py b/browser/form.py
index e7ac588..aa59167 100644
--- a/browser/form.py
+++ b/browser/form.py
@@ -500,6 +500,9 @@ class EditObject(FormController, I18NView):
 
     @Lazy
     def target(self):
+        targetUid = self.request.form.get('targetUid')
+        if targetUid:
+            return self.view.getObjectForUid(targetUid)
         return self.view.virtualTargetObject or self.context
 
     @Lazy
@@ -694,7 +697,7 @@ class CreateObject(EditObject):
         obj.setType(self.loopsRoot.loopsTraverse(tc))
         notify(ObjectCreatedEvent(obj))
         #notify(ObjectAddedEvent(obj))
-        self.object = obj
+        self.object = self.view.object = obj
         formState = self.updateFields() # TODO: suppress validation
         self.view.formState = formState
         # TODO: error handling
diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index eeec0bd..47f56b1 100644
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -19,7 +19,9 @@
       <input type="hidden" name="form.action" value="edit"
              tal:attributes="value view/form_action" />
       <input type="hidden" name="version"
-             tal:attributes="value request/version | nothing" />
+             tal:attributes="value request/version|nothing" />
+      <input type="hidden" name="targetUid"
+             tal:attributes="value request/targetUid|nothing" />
       <tal:title condition="not:view/isInnerHtml">
         <h1 tal:content="request/view_title|view/title"
             i18n:translate="">Edit Information Object</h1>
diff --git a/browser/resource_macros.pt b/browser/resource_macros.pt
index 2a8b9fb..406e519 100644
--- a/browser/resource_macros.pt
+++ b/browser/resource_macros.pt
@@ -83,8 +83,8 @@
       </span>
       <span class="button"
             tal:condition="item/xeditable">
-        <a title="Edit with External Editor"
-           i18n:translate=""
+        <a title="Edit with external editor"
+           i18n:translate="" i18n:attributes="title"
            tal:define="url view/virtualTargetUrl"
            tal:attributes="href string:$url/external_edit?version=this">
          Open for editing
diff --git a/compound/book/view_macros.pt b/compound/book/view_macros.pt
index 3ded0de..ec1e68c 100644
--- a/compound/book/view_macros.pt
+++ b/compound/book/view_macros.pt
@@ -4,6 +4,26 @@
 <metal:section define-macro="section">
   <metal:info use-macro="view/concept_macros/concepttitle" />
   <div tal:repeat="related item/resources">
+    <div class="object-actions" style="padding-top: 0"
+         tal:define="url python:view.getUrlForTarget(related.context)"
+         tal:condition="related/editable">
+      <a i18n:translate="" i18n:attributes="title"
+         title="Edit"
+         tal:define="targetUid python:view.getUidForObject(related.context);
+                     url 
+                string:$url/edit_object.html?version=this&targetUid=$targetUid"
+         tal:attributes="href url;
+                         onclick string:objectDialog('edit', '$url');; 
+                                        return false">
+        <img tal:attributes="src 
+                  string:$resourceBase/cybertools.icons/vcard_edit.png" /></a>
+      <a i18n:translate="" i18n:attributes="title"
+         title="Edit with external editor."
+         tal:condition="related/xeditable"
+         tal:attributes="href string:$url/external_edit?version=this">
+        <img tal:attributes="src 
+            string:$resourceBase/cybertools.icons/application_edit.png" /></a>
+      </div>
     <div tal:attributes="class python:
                 item.getCssClassForResource(related)"
          tal:content="structure related/render" />