diff --git a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/document.xml b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/document.xml
index 211aeefccdf6a486771ad39a752053de81641b9c..26c8cd833c3accdb4405172e770cf21e51e74576 100644
--- a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/document.xml
+++ b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/document.xml
@@ -93,7 +93,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
                       i18n:translate="" i18n:domain="ui">Save</span>\n
               </button>\n
             </tal:block>\n
-            <ul tal:condition="python: len(actions) > 1">\n
+            <ul tal:condition="python: len(actions)">\n
               <tal:block tal:repeat="action actions">\n
                 <li tal:attributes="class python: action == current_action and \'selected\' or \'not_selected\'">\n
                   <a tal:attributes="href python: here.ERP5Site_renderLink(action[\'url\'], http_parameters)"\n
@@ -111,10 +111,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
 
 ]]></string> </value>
         </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>text/html</string> </value>
+        </item>
+        <item>
+            <key> <string>expand</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>document</string> </value>
         </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
index b643fdac70bacd1afd6b79cf16b5fbbbca4c2026..c668b9dc62d35dd5b6fb26ed511412007f60f8ea 100644
--- a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
+++ b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml
@@ -515,6 +515,10 @@ div.index_html table {\n
   top: 100%;\n
 }\n
 \n
+.content .field .figure {\n
+  text-align: right;\n
+}\n
+\n
 .content .left,\n
 .content .right {\n
   width: 50%;\n
diff --git a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form.xml b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form.xml
index 0f07e171713627216d7beff87e251eca68bef5a4..de00d28a8989e959b6e69ba5aa4cb8606b01a955 100644
--- a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form.xml
+++ b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form.xml
@@ -139,7 +139,7 @@ Groups names becomes "left_group", "right_group", "left1_group", "right1_group",
                          right_group python: form.get_fields_in_group(\'right\');\n
                          left1_group python: form.get_fields_in_group(\'left 1\');\n
                          right1_group python: form.get_fields_in_group(\'right 1\');\n
-                         bottom_group python: form.get_fields_in_group(\'bottom\');">\n
+                         center_group python: form.get_fields_in_group(\'center\');">\n
     <tal:block metal:use-macro="here/developper_shortcuts/macros/form" />\n
     <div tal:condition="python: len(left_group) > 0 or len(right_group) > 0"\n
          class="top_group">\n
@@ -173,12 +173,10 @@ Groups names becomes "left_group", "right_group", "left1_group", "right1_group",
       </div>\n
       <hr class="clear" />\n
     </div>\n
-    <div tal:condition="python: len(bottom_group) > 0"\n
+    <div tal:condition="python: len(center_group) > 0"\n
          class="bottom">\n
-      <tal:block tal:repeat="field python: form.get_fields_in_group(\'bottom\')">\n
-        <tal:block metal:use-macro="here/developper_shortcuts/macros/field" />\n
-        <tal:block tal:define="value python:request.get(field.id, None)"\n
-                   tal:replace="structure python:field.render(value, request)" />\n
+      <tal:block tal:repeat="field center_group">\n
+        <tal:block metal:use-macro="here/field_render/macros/field_render" />\n
       </tal:block>\n
     </div>\n
   </tal:block>\n
diff --git a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
index 1de8cd647e0509bb685b828d6499afde6024d619..c15d95444caa3f4bb86e58e6416421088a3f864b 100644
--- a/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
+++ b/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
@@ -85,7 +85,7 @@ IDEAS:\n
 </tal:block>\n
 <tal:block tal:define="global actions python:here.getPortalObject().portal_actions.listFilteredActionsFor(here);\n
                        global form_id request/form_id | form/id | nothing;\n
-                       global dialog_id form/id | nothing;\n
+                       global dialog_id form/id | template/id;\n
                        global field_errors python: request.get(\'field_errors\',{});\n
 \n
                        global cancel_url request/cancel_url | request/HTTP_REFERER;\n