diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_content.css.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_content.css.xml
index 0eb8a21507265ba22681cd6bc71a679676e1563f..5469f97ff320e9d7c9c7c7878b0029fbd5830cca 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_content.css.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/erp5_egov_content.css.xml
@@ -292,10 +292,6 @@ div#main_content fieldset > div {\n
   position: relative;\n
 }\n
 \n
-div#main_content fieldset div.input {\n
-  margin-left: 11.5em;  /* = div#main_content label width + 0.5 of margin */\n
-}\n
-\n
 div#main_content fieldset legend {\n
   padding: .2em .5em;\n
   font-weight: bold;\n
@@ -523,6 +519,12 @@ div#main_content fieldset.webcontent span.headline {\n
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderWorkspaceRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderWorkspaceRenderer.xml
index 7d129917c6f5eb7fed2e73452e7959a548f7c7ec..da0ff3aa6103227bc4832167a35754f8f6e860c7 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderWorkspaceRenderer.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderWorkspaceRenderer.xml
@@ -66,9 +66,11 @@
         <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" \n
           href="./home" i18n:translate="" i18n:domain="ui">Home</a>\n
       </tal:block>\n
+      <!--\n
       <tal:block tal:condition="not:here/portal_membership/isAnonymousUser">\n
         <a class="preferences" href="./preferences" i18n:translate="" i18n:domain="ui">Preferences</a>\n
       </tal:block>\n
+      -->\n
       <a class="help" href="./help" i18n:translate="" i18n:domain="ui">Help</a>\n
     </span>\n
     <hr/>\n
@@ -95,6 +97,12 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
index 878c1499db13d77e6c1124bd3ba12282c3f06dde..eb757ce5f91419dc81eeb8d8d33add68847eba7f 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
@@ -65,11 +65,12 @@
       </tal:block>\n
         <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" \n
           href="./home" i18n:translate="" i18n:domain="ui">Home</a>\n
+      <!--\n
       <tal:block tal:condition="not:here/portal_membership/isAnonymousUser">\n
         <a class="preferences" href="./preferences" i18n:translate="" i18n:domain="ui">Preferences</a>\n
       </tal:block>\n
-      <!--<a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()" i18n:translate="" i18n:domain="ui">Help</a>-->\n
-      <a class="help" href="EGov_helpWithContext"  tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()"  onclick="window.open(this.href, \'safi_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
+      -->\n
+      <a class="help" href="EGov_helpWithContext" tal:attributes="href python:\'help/\' + here.EGov_helpWithContext()"  onclick="window.open(this.href, \'safi_help\',\'width=800,height=500,menubar=yes,toolbar=yes,scrollbars=yes,resizable=yes\'); return false;" i18n:translate="" i18n:domain="ui">Help</a>\n
 \n
     </span>\n
     <hr/>\n
@@ -96,6 +97,12 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision
index 34578cc4c5ec458b4ad2ee89f52cfe58fa308f03..eaea6f59715638e11200d8bdb771e0280f482354 100644
--- a/bt5/erp5_egov/bt/revision
+++ b/bt5/erp5_egov/bt/revision
@@ -1 +1 @@
-239
\ No newline at end of file
+240
\ No newline at end of file