diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view.xml
index fbdb9dd1f4e1532b2d2babf187a60645fcde6457..ba665f0b5b960babf85849421fc9ca12ee9a3351 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view.xml
@@ -45,12 +45,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>
@@ -67,10 +61,10 @@
             <key> <string>group_list</string> </key>
             <value>
               <list>
-                <string>left id</string>
-                <string>right detail</string>
-                <string>center comment</string>
-                <string>content bottom core</string>
+                <string>left</string>
+                <string>right</string>
+                <string>center</string>
+                <string>content bottom</string>
                 <string>hidden</string>
               </list>
             </value>
@@ -80,7 +74,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>center comment</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list>
                         <string>my_description</string>
@@ -88,7 +82,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>content bottom core</string> </key>
+                    <key> <string>content bottom</string> </key>
                     <value>
                       <list>
                         <string>my_text_content</string>
@@ -102,24 +96,24 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left id</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
-                        <string>my_title</string>
-                        <string>my_short_title</string>
                         <string>my_reference</string>
-                        <string>my_translated_validation_state_title</string>
+                        <string>my_version</string>
+                        <string>my_short_title</string>
+                        <string>my_int_index</string>
+                        <string>my_language</string>
                       </list>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right detail</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
+                        <string>my_title</string>
                         <string>my_publication_section</string>
-                        <string>my_version</string>
-                        <string>my_language</string>
-                        <string>my_int_index</string>
+                        <string>my_validation_state</string>
                       </list>
                     </value>
                 </item>
@@ -140,7 +134,7 @@
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>form_view</string> </value>
+            <value> <string>web_form_view</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml
index 28db0f18c0250b4259f987a6118b76e12d4fefb0..2c810416e7c93e24825a067d2428165eeff74989 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml
@@ -50,43 +50,56 @@
               <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<tal:block tal:define="default_layout  string:view_master;\n
-                       default_content here/WebSite_getDefaultDocumentValue | nothing;\n
-                       ignore_layout   request/ignore_layout | nothing;\n
-                       editable_mode   request/editable_mode | nothing;\n
-                       layout_form_id  here/getApplicableLayout | nothing;\n
-                       layout_form     python:not(layout_form_id) or ignore_layout or getattr(here, layout_form_id, None);\n
-                       layout_id       layout_form/pt | default_layout;">\n
+<tal:block tal:replace="nothing"\n
+           xmlns:tal="http://xml.zope.org/namespaces/tal"\n
+           xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+           xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
+<!--\n
+Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.\n
+                   Vincent Pelletier <vincent@nexedi.com>\n
 \n
-  <tal:block metal:use-macro="python: getattr(here, layout_id).macros[\'master\']">\n
-    <tal:block metal:fill-slot="main">\n
-      <tal:block tal:condition="python: (not editable_mode) and (not ignore_layout) and (default_content is not None)">\n
-        <tal:block tal:define="global here                  python: default_content;\n
-                               global form                  python: here.WebPage_view;\n
-                               global default_content_title python: here.getTitle()"/>\n
-      </tal:block>\n
+This program is Free Software; you can redistribute it and/or\n
+modify it under the terms of the GNU General Public License\n
+as published by the Free Software Foundation; either version 2\n
+of the License, or (at your option) any later version.\n
 \n
-      <tal:block tal:condition="python: not(default_content is None and not editable_mode)">\n
-        <tal:block metal:use-macro="here/form_view/macros/form_render" />\n
-      </tal:block>\n
+This program is distributed in the hope that it will be useful,\n
+but WITHOUT ANY WARRANTY; without even the implied warranty of\n
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n
+GNU General Public License for more details.\n
 \n
-      <tal:block tal:condition="python: default_content is None and not editable_mode">\n
-        No default page defined.\n
+You should have received a copy of the GNU General Public License\n
+along with this program; if not, write to the Free Software\n
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
+-->\n
+</tal:block>\n
+<tal:block tal:define="ignore_layout request/ignore_layout | nothing;">\n
+  <tal:block tal:condition="ignore_layout">\n
+    <tal:block metal:use-macro="here/form_view/macros/master" />\n
+  </tal:block>\n
+  <tal:block tal:condition="not: ignore_layout">\n
+    <tal:block tal:define="editable_mode request/editable_mode | nothing;">\n
+      <tal:block tal:condition="editable_mode">\n
+        <tal:block metal:use-macro="here/web_form_view/macros/master" />\n
+      </tal:block>\n
+      <tal:block tal:condition="not: editable_mode">\n
+        <tal:block tal:define="default_content here/WebSite_getDefaultDocumentValue | nothing;">\n
+          <tal:block tal:condition="default_content">\n
+            <tal:block tal:define="dummy python: request.RESPONSE.redirect(\'%s/%s\' % (here.WebSite_getUrl(), default_content.getReference()))" />\n
+          </tal:block>\n
+          <tal:block tal:condition="not: default_content">\n
+            No default page defined.\n
+          </tal:block>\n
+        </tal:block>\n
       </tal:block>\n
     </tal:block>\n
   </tal:block>\n
-\n
-</tal:block>
+</tal:block>\n
+
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/web_form_view.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/web_form_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7d4c02625e828bc95c9d9530872384dbe1c282f3
--- /dev/null
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/web_form_view.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PageTemplates.ZopePageTemplate</string>
+          <string>ZopePageTemplate</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+<tal:block tal:replace="nothing"\n
+           xmlns:tal="http://xml.zope.org/namespaces/tal"\n
+           xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+           xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
+<!--\n
+Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.\n
+                   Vincent Pelletier <vincent@nexedi.com>\n
+\n
+This program is Free Software; you can redistribute it and/or\n
+modify it under the terms of the GNU General Public License\n
+as published by the Free Software Foundation; either version 2\n
+of the License, or (at your option) any later version.\n
+\n
+This program is distributed in the hope that it will be useful,\n
+but WITHOUT ANY WARRANTY; without even the implied warranty of\n
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n
+GNU General Public License for more details.\n
+\n
+You should have received a copy of the GNU General Public License\n
+along with this program; if not, write to the Free Software\n
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
+-->\n
+</tal:block>\n
+<tal:block metal:define-macro="master">\n
+  <tal:block metal:use-macro="here/document/macros/master">\n
+    <tal:block metal:fill-slot="main">\n
+      <tal:block tal:define="editable_mode request/editable_mode | nothing;\n
+                             dummy python: request.set(\'here\', here);">\n
+        <tal:block tal:condition="editable_mode">\n
+          <tal:block metal:use-macro="here/form/macros/master" />\n
+        </tal:block>\n
+        <tal:block tal:condition="not: editable_mode">\n
+          <tal:block tal:repeat="group python: form.get_groups()">\n
+            <div tal:condition="python: group.find(\'content\') >= 0"\n
+                 tal:attributes="class group/lower">\n
+              <tal:block tal:condition="python: \'hidden\' not in group.lower()">\n
+                <tal:block tal:repeat="field python:form.get_fields_in_group(group)">\n
+                  <tal:block tal:replace="structure python: field.render(None, request)"/>\n
+                </tal:block>\n
+              </tal:block>\n
+            </div>\n
+          </tal:block>\n
+        </tal:block>\n
+      </tal:block>\n
+    </tal:block>\n
+  </tal:block>\n
+</tal:block>\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>web_form_view</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>