--- a/src/pyams_portal/zmi/container.py	Tue Oct 11 16:05:54 2016 +0200
+++ b/src/pyams_portal/zmi/container.py	Tue Oct 11 16:06:12 2016 +0200
@@ -65,7 +65,7 @@
     @property
     def url(self):
         site = get_parent(self.context, ISite)
-        return resource_url(site, self.request, 'admin.html#{0}'.format(self.view_name))
+        return resource_url(site, self.request, 'admin#{0}'.format(self.view_name))
 
 
 @viewlet_config(name='portal-templates.menu', context=ISite, layer=IAdminLayer, manager=IControlPanelMenu,
@@ -110,7 +110,7 @@
 
     @property
     def url(self):
-        return resource_url(self.context, self.request, 'admin.html#{0}'.format(self.view_name))
+        return resource_url(self.context, self.request, 'admin#{0}'.format(self.view_name))
 
 
 @adapter_config(name='name', context=(Interface, IAdminLayer, PortalTemplateContainerTable), provides=IColumn)

--- a/src/pyams_portal/zmi/layout.py	Tue Oct 11 16:05:54 2016 +0200
+++ b/src/pyams_portal/zmi/layout.py	Tue Oct 11 16:06:12 2016 +0200
@@ -147,7 +147,7 @@
 class PortalTemplateLayoutHeaderAdapter(PortalTemplateHeaderAdapter):
     """Portal template configuration header adapter"""
 
-    back_url = '/admin.html#portal-templates.html'
+    back_url = '/admin#portal-templates.html'
     back_target = None
 
 

--- a/src/pyams_portal/zmi/page.py	Tue Oct 11 16:05:54 2016 +0200
+++ b/src/pyams_portal/zmi/page.py	Tue Oct 11 16:06:12 2016 +0200
@@ -129,7 +129,7 @@
     def get_url(self):
         page = IPortalPage(self.context)
         if page.use_local_template:
-            return absolute_url(page.template, self.request, 'admin.html#properties.html')
+            return absolute_url(page.template, self.request, 'admin#properties.html')
         else:
             return super(PortalContextTemplateConfigMenu, self).get_url()