diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderFormRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderFormRenderer.xml
index 21f83a0727ec2a84db602a3e7a20184bb3241fd8..1dcd5c2db5a42f66a5a10aa8ab3b9881b76f2cf9 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderFormRenderer.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewDGIDHeaderFormRenderer.xml
@@ -56,8 +56,8 @@
   <div style="background-image: url(img/flag_of_senegal.png); background-repeat:no-repeat; height: 40px;padding-top: 20px; padding-left: 95px; margin-left: 5px;">\n
     <ul class="onleft">\n
       <li><tal:block i18n:translate="" i18n:domain="ui">Application Number</tal:block> : <span class="value"><tal:block tal:replace="here/getId"></tal:block></span></li>\n
-      <li><tal:block i18n:translate="" i18n:domain="ui">Status</tal:block> : <span class="value" tal:attributes="class python:\'%s_state\' % context.getValidationState()"><tal:block tal:replace="here/getTranslatedValidationState"/></span></li>\n
-      <li><tal:block i18n:translate="" i18n:domain="ui">Type</tal:block> : <span class="value"><tal:block tal:replace="here/getPortalType"></tal:block></span></li>\n
+      <li><tal:block i18n:translate="" i18n:domain="ui">Status</tal:block> : <span class="value" tal:attributes="class python:\'%s_state\' % context.getValidationState()"><tal:block tal:replace="here/getTranslatedValidationStateTitle"/></span></li>\n
+      <li><tal:block i18n:translate="" i18n:domain="ui">Type</tal:block> : <span class="value"><tal:block i18n:translate="" i18n:domain="ui" tal:content="here/getPortalType"></tal:block></span></li>\n
     </ul>\n
     <span class="onright">\n
       <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" href="./home" \n
@@ -66,7 +66,7 @@
         <a class="print" href="DeclarationTVA_viewDeclarationTVAAsPdf"\n
           tal:attributes="href python: context.getPrintFormUrl()" i18n:translate="" i18n:domain="ui">Print</a>\n
       </tal:block>      \n
-      <a class="help" href="./help" 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
     </span>\n
     <div class="clear">\n
     <div>  \n
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 da0ff3aa6103227bc4832167a35754f8f6e860c7..254d3acdec665fe4fa68a7f35dcda28be9849bf2 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
@@ -71,7 +71,7 @@
         <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
+      <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
     </span>\n
     <hr/>\n
   \n
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
index 675dda975365a1e246e507e5dd337473efca6eb7..bfcab123c546259074b1503daa3800be4b1e37ef 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
@@ -57,7 +57,7 @@
     <ul class="onleft">\n
       <li><tal:block i18n:translate="" i18n:domain="ui">Application Number</tal:block> : <span class="value"><tal:block tal:replace="here/getId"></tal:block></span></li>\n
       <li><tal:block i18n:translate="" i18n:domain="ui">Status</tal:block> : <span class="value" tal:attributes="class python:\'%s_state\' % context.getValidationState()"><tal:block tal:replace="here/getTranslatedValidationStateTitle"/></span></li>\n
-      <li><tal:block i18n:translate="" i18n:domain="ui">Type</tal:block> : <span class="value"><tal:block tal:replace="here/getPortalType"></tal:block></span></li>\n
+      <li><tal:block i18n:translate="" i18n:domain="ui">Type</tal:block> : <span class="value"><tal:block  i18n:translate="" i18n:domain="ui" tal:content="here/getPortalType"></tal:block></span></li>\n
     </ul>\n
     <span class="onright">\n
       <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" href="./home" \n
diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision
index e21ad0e4fb7d1edee08de145cb18998d252085ab..61f9147fdcaa2af189830f4ea1ac5f9c552cd4f3 100644
--- a/bt5/erp5_egov/bt/revision
+++ b/bt5/erp5_egov/bt/revision
@@ -1 +1 @@
-273
\ No newline at end of file
+275
\ No newline at end of file