diff --git a/webapp/WEB-INF/templates/skin/site/page_frameset.html b/webapp/WEB-INF/templates/skin/site/page_frameset.html
index 7504b34b2..60d2211ca 100644
--- a/webapp/WEB-INF/templates/skin/site/page_frameset.html
+++ b/webapp/WEB-INF/templates/skin/site/page_frameset.html
@@ -64,10 +64,25 @@
@Extender[${page_id},PAGE,rating,{show:"all"}]@
@Extender[${page_id},PAGE,actionbar]@
#if>
-
+
+
+<#if customMenuSideBar??>
+ ${customMenuSideBar}
+
+
+
+ ${page_content}
+ <#if display_last_modified?? && display_last_modified >
#i18n{portal.site.site_property.page.lastModified} ${last_modified!}
#if>
+
+
+<#else>
+
${page_content}
<#if display_last_modified?? && display_last_modified >
#i18n{portal.site.site_property.page.lastModified} ${last_modified!}
#if>
+#if>
+
+
<#if page_id?? && isExtendInstalled?? && isExtendInstalled>
@Extender[${page_id},PAGE,comment]@
diff --git a/webapp/WEB-INF/templates/skin/site/page_header_home.html b/webapp/WEB-INF/templates/skin/site/page_header_home.html
index dc0fd64b9..332ff3582 100644
--- a/webapp/WEB-INF/templates/skin/site/page_header_home.html
+++ b/webapp/WEB-INF/templates/skin/site/page_header_home.html
@@ -15,6 +15,9 @@
#i18n{portal.site.page_home.label}
+ <#if customMenuMainPage??>
+ ${customMenuMainPage}
+ <#else>
<#assign menu=page_main_menu>
${page_main_menu_html!menu}
@@ -22,7 +25,8 @@
Documentation
-
+
+ #if>
${pageinclude_userlogin?default("")}
diff --git a/webapp/WEB-INF/templates/skin/site/page_header_internal.html b/webapp/WEB-INF/templates/skin/site/page_header_internal.html
index dc0fd64b9..957d17dc3 100644
--- a/webapp/WEB-INF/templates/skin/site/page_header_internal.html
+++ b/webapp/WEB-INF/templates/skin/site/page_header_internal.html
@@ -15,7 +15,10 @@