diff --git a/browser/common.py b/browser/common.py
index c6f3e09..dd97b8e 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -722,6 +722,8 @@ class BaseView(GenericView, I18NView):
                   'dojo.require("dijit.form.TimeTextBox"); '
                   'dojo.require("dijit.form.SimpleTextarea"); '
                   'dojo.require("dijit.form.FilteringSelect"); '
+                  'dojo.require("dijit.layout.BorderContainer"); '
+                  'dojo.require("dijit.layout.ContentPane"); '
                   'dojo.require("dojox.data.QueryReadStore"); ')
         cm.register('js-execute', 'dojo.form.all', jsCall=jsCall)
 
diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index 8f0cc22..bdc4761 100644
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -3,15 +3,18 @@
      $Id$ -->
 
 
-<metal:block define-macro="edit" i18n:domain="loops">
-    <form method="post" enctype="multipart/form-data"
-          id="dialog_form" class="dialog"
-          dojoType="dijit.form.Form"
-          tal:define="langInfo view/languageInfo;
-                      languages langInfo/availableLanguages;
-                      language langInfo/language;
-                      useI18N view/useI18NForEditing;
-                      innerForm request/inner_form | string:inner_concept_edit_form.html;">
+<form metal:define-macro="edit" i18n:domain="loops"
+      method="post" enctype="multipart/form-data"
+      id="dialog_form" class="dialog"
+      dojoType="dijit.form.Form"
+      tal:define="langInfo view/languageInfo;
+                  languages langInfo/availableLanguages;
+                  language langInfo/language;
+                  useI18N view/useI18NForEditing;
+                  innerForm request/inner_form | string:inner_concept_edit_form.html;">
+  <div dojoType="dijit.layout.BorderContainer"
+       style="width: 60em; height: 600px">
+    <div dojoType="dijit.layout.ContentPane" region="center">
       <input type="hidden" name="form.action" value="edit"
              tal:attributes="value view/form_action" />
       <input type="hidden" name="version"
@@ -59,20 +62,24 @@
           </tal:custom>
           <tr metal:use-macro="view/template/macros/versioning" />
           <tr metal:use-macro="view/template/macros/states" />
-          <tr metal:use-macro="view/template/macros/buttons" />
         </tbody>
       </table>
-    </form>
-</metal:block>
+    </div>
+    <div metal:use-macro="view/template/macros/buttons" />
+  </div>
+</form>
 
 
-<metal:block define-macro="create" i18n:domain="loops">
-    <form method="post" enctype="multipart/form-data"
-          id="dialog_form" class="dialog"
-          tal:define="qualifier request/qualifier | string:resource;
-                      innerForm request/inner_form | string:inner_form.html;
-                      typeToken view/typeToken;
-                      fixedType view/fixedType">
+<div metal:define-macro="create" i18n:domain="loops"
+     dojoType="dijit.layout.BorderContainer"
+     style="width: 60em; height: 600px">
+  <form method="post" enctype="multipart/form-data"
+        id="dialog_form" class="dialog"
+        tal:define="qualifier request/qualifier | string:resource;
+                    innerForm request/inner_form | string:inner_form.html;
+                    typeToken view/typeToken;
+                    fixedType view/fixedType">
+    <div dojoType="dijit.layout.ContentPane" region="center">
       <input type="hidden" name="form.action" value="create"
              tal:attributes="value view/form_action" />
       <input type="hidden" name="fixed_type"
@@ -115,11 +122,12 @@
                       condition="customMacro">
             <tr metal:use-macro="customMacro" />
           </tal:custom>
-          <tr metal:use-macro="view/template/macros/buttons" />
         </tbody>
       </table>
-    </form>
-</metal:block>
+    </div>
+    <div metal:use-macro="view/template/macros/buttons" />
+  </form>
+</div>
 
 
 <metal:assignments define-macro="assignments"
@@ -272,8 +280,8 @@
 </metal:states>
 
 
-<tr metal:define-macro="buttons" i18n:domain="" class="buttons">
-            <td colspan="5">
+<div metal:define-macro="buttons" i18n:domain="" class="buttons"
+     dojoType="dijit.layout.ContentPane" region="bottom">
               <input value="Save" type="submit"
                      i18n:attributes="value"
                      tal:attributes="onClick python: view.closeAction(True) or
@@ -282,8 +290,7 @@
                      i18n:attributes="value"
                      tal:condition="view/isInnerHtml"
                      tal:attributes="onClick view/closeAction">
-            </td>
-</tr>
+</div>
 
 
 <!-- overridden field renderers -->
diff --git a/organize/browser/view_macros.pt b/organize/browser/view_macros.pt
index 69d9d3d..1f490c3 100644
--- a/organize/browser/view_macros.pt
+++ b/organize/browser/view_macros.pt
@@ -58,9 +58,12 @@
 </metal:block>
 
 
-<metal:block define-macro="send_email">
-    <form method="post" id="sendEmail_form" name="sendEmail" class="dialog"
-          dojoType="dijit.form.Form">
+<form metal:define-macro="send_email"
+      method="post" id="sendEmail_form" name="sendEmail" class="dialog"
+      dojoType="dijit.form.Form">
+  <div dojoType="dijit.layout.BorderContainer"
+       style="width: 65em; height: 600px">
+    <div dojoType="dijit.layout.ContentPane" region="center">
       <input type="hidden" name="form.action" value="send_email" />
       <div class="heading">
         <span i18n:translate="">Send Link by Email</span> -
@@ -92,6 +95,7 @@
                  onClick="p = document.forms.sendEmail['recipients:list'];
                           for (i in p) p[i].checked=this.checked;" />
           <span i18n:translate="">Toggle all</span></div>
+      </div>
       <div>
         <label i18n:translate="" for="addrecipients">Additional recipients</label>
         <div>
@@ -99,6 +103,8 @@
                     dojoType="dijit.form.SimpleTextarea"
                     style="width: 60em"></textarea></div>
       </div>
+    </div>
+    <div dojoType="dijit.layout.ContentPane" region="bottom">
       <div class="buttons">
         <input value="Send email" type="submit"
                onClick="return closeDialog(true)"
@@ -106,5 +112,6 @@
         <input type="button" value="Cancel"
                onClick="return closeDialog(false)"
                i18n:attributes="value"></div>
-    </form>
-</metal:block>
+    </div>
+  </div>
+</form>