diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ar.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ar.properties
index 90b13635c..725317421 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ar.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ar.properties
@@ -23,6 +23,7 @@ layout.apply=تطبيق
 layout.next=Next
 layout.save=احفظ
 layout.deleteContainer=حذف الحاوية
+layout.deleteSection=Delete section
 layout.addApplication=إضافة تطبيق
 layout.moveCell=نقل الخلية
 layout.resizeCell=تغيير حجم الخلية
@@ -80,6 +81,7 @@ layout.fixedHeight500=عالية (500px)
 layout.fixedHeightCustom=مخصص
 layout.invalidFixedHeight=الرجاء اختيار قيمة بين {0} و {1} px
 layout.hiddenOnMobile=يتم إخفاء التطبيق عند استخدام الهاتف المحمول
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=السلوك عند التمرير لأسفل
 layout.scrollNoSticky=لا يوجد سلوك مثبت
 layout.scrollStickyLastApp=آخر تطبيق في العمود
@@ -335,6 +337,7 @@ layout.gradientFrom=من عند
 layout.gradientTo=إلى
 layout.saveDraft=احفظ
 layout.saveDraftTooltip=حفظ الصفحة كمسودة
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=نشر تعديلات الصفحة
 layout.readonlyPortletContent=قراءة محتوى المدخل فقط
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_aro.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_aro.properties
index f7b2bd902..3437b9015 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_aro.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_aro.properties
@@ -23,6 +23,7 @@ layout.apply=تطبيق
 layout.next=Next
 layout.save=احفظ
 layout.deleteContainer=حذف الحاوية
+layout.deleteSection=Delete section
 layout.addApplication=إضافة تطبيق
 layout.moveCell=نقل الخلية
 layout.resizeCell=تغيير حجم الخلية
@@ -80,6 +81,7 @@ layout.fixedHeight500=عالية (500px)
 layout.fixedHeightCustom=مخصص
 layout.invalidFixedHeight=الرجاء اختيار قيمة بين {0} و {1} px
 layout.hiddenOnMobile=يتم إخفاء التطبيق عند استخدام الهاتف المحمول
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=السلوك عند التمرير لأسفل
 layout.scrollNoSticky=لا يوجد سلوك مثبت
 layout.scrollStickyLastApp=آخر تطبيق في العمود
@@ -335,6 +337,7 @@ layout.gradientFrom=من
 layout.gradientTo=إلى
 layout.saveDraft=احفظ
 layout.saveDraftTooltip=حفظ الصفحة كمسودة
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=نشر تعديلات الصفحة
 layout.readonlyPortletContent=قراءة محتوى المدخل فقط
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_az.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_az.properties
index fd0f1f200..8bbed7938 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_az.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_az.properties
@@ -23,6 +23,7 @@ layout.apply=Apply
 layout.next=Next
 layout.save=Save
 layout.deleteContainer=Delete container
+layout.deleteSection=Delete section
 layout.addApplication=Add Application
 layout.moveCell=Move Cell
 layout.resizeCell=Resize Cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=High (500px)
 layout.fixedHeightCustom=Custom
 layout.invalidFixedHeight=Please choose a value between {0} and {1} px
 layout.hiddenOnMobile=App is hidden when using mobile
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Behaviour when scrolling down
 layout.scrollNoSticky=No sticky behaviour
 layout.scrollStickyLastApp=Last app in the column
@@ -335,6 +337,7 @@ layout.gradientFrom=From
 layout.gradientTo=To
 layout.saveDraft=Save
 layout.saveDraftTooltip=Save page as draft
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publish page modifications
 layout.readonlyPortletContent=Read Only Portlet Content
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ca.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ca.properties
index 89982a38f..14b8990f9 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ca.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ca.properties
@@ -23,6 +23,7 @@ layout.apply=Aplicar
 layout.next=Next
 layout.save=Desa
 layout.deleteContainer=Suprimeix el contenidor
+layout.deleteSection=Delete section
 layout.addApplication=Afegeix una aplicació
 layout.moveCell=Mou la cel·la
 layout.resizeCell=Canvia la mida de la cel·la
@@ -80,6 +81,7 @@ layout.fixedHeight500=Alt (500píxels)
 layout.fixedHeightCustom=Personalitzat
 layout.invalidFixedHeight=Si us plau, trieu un valor entre {0} i {1} px
 layout.hiddenOnMobile=L'aplicació s'amaga quan s'utilitza el mòbil
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Comportament en desplaçar-se cap avall
 layout.scrollNoSticky=Cap comportament enganxós
 layout.scrollStickyLastApp=Última aplicació de la columna
@@ -335,6 +337,7 @@ layout.gradientFrom=Des de
 layout.gradientTo=A
 layout.saveDraft=Desa
 layout.saveDraftTooltip=Desa la pàgina com a esborrany
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publicar modificacions a la pàgina
 layout.readonlyPortletContent=Contingut de portlet de només lectura
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ceb.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ceb.properties
index fd0f1f200..8bbed7938 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ceb.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ceb.properties
@@ -23,6 +23,7 @@ layout.apply=Apply
 layout.next=Next
 layout.save=Save
 layout.deleteContainer=Delete container
+layout.deleteSection=Delete section
 layout.addApplication=Add Application
 layout.moveCell=Move Cell
 layout.resizeCell=Resize Cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=High (500px)
 layout.fixedHeightCustom=Custom
 layout.invalidFixedHeight=Please choose a value between {0} and {1} px
 layout.hiddenOnMobile=App is hidden when using mobile
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Behaviour when scrolling down
 layout.scrollNoSticky=No sticky behaviour
 layout.scrollStickyLastApp=Last app in the column
@@ -335,6 +337,7 @@ layout.gradientFrom=From
 layout.gradientTo=To
 layout.saveDraft=Save
 layout.saveDraftTooltip=Save page as draft
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publish page modifications
 layout.readonlyPortletContent=Read Only Portlet Content
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_co.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_co.properties
index afa900319..a3a5e2d12 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_co.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_co.properties
@@ -23,6 +23,7 @@ layout.apply=Applica
 layout.next=Next
 layout.save=Salvà
 layout.deleteContainer=Sguassà u containeru
+layout.deleteSection=Delete section
 layout.addApplication=Aghjunghjite l'applicazione
 layout.moveCell=Move Cell
 layout.resizeCell=Resize Cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=Altu (500 px)
 layout.fixedHeightCustom=Custom
 layout.invalidFixedHeight=Per piacè sceglite un valore trà {0} è {1} px
 layout.hiddenOnMobile=L'app hè oculata quandu si usa u telefuninu
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Cumportamentu quandu scrolling down
 layout.scrollNoSticky=Nisun cumpurtamentu appiccicosu
 layout.scrollStickyLastApp=Ultima app in a colonna
@@ -335,6 +337,7 @@ layout.gradientFrom=Da
 layout.gradientTo=À
 layout.saveDraft=Salvà
 layout.saveDraftTooltip=Salvà a pagina cum'è draft
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publicate mudificazioni di a pagina
 layout.readonlyPortletContent=Leghjite solu u cuntenutu di u Portlet
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_cs.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_cs.properties
index 6be17a2a8..ba13bb420 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_cs.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_cs.properties
@@ -23,6 +23,7 @@ layout.apply=Použít
 layout.next=Next
 layout.save=Uložit
 layout.deleteContainer=Odstranit kontejner
+layout.deleteSection=Delete section
 layout.addApplication=Přidat aplikaci
 layout.moveCell=Přesunout buňku
 layout.resizeCell=Změnit velikost buňky
@@ -80,6 +81,7 @@ layout.fixedHeight500=Vysoká (500px)
 layout.fixedHeightCustom=Vlastní
 layout.invalidFixedHeight=Vyberte hodnotu mezi {0} a {1} px
 layout.hiddenOnMobile=Při používání mobilního telefonu se aplikace skryje
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Chování při posouvání dolů
 layout.scrollNoSticky=Bez lepšího chování
 layout.scrollStickyLastApp=Poslední aplikace ve sloupci
@@ -335,6 +337,7 @@ layout.gradientFrom=Od
 layout.gradientTo=Do
 layout.saveDraft=Uložit
 layout.saveDraftTooltip=Uložit stránku jako koncept
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publikovat změny stránky
 layout.readonlyPortletContent=Číst pouze obsah portletu
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_de.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_de.properties
index fb1031d37..731257507 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_de.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_de.properties
@@ -23,6 +23,7 @@ layout.apply=Anwenden
 layout.next=Nächste
 layout.save=Speichern
 layout.deleteContainer=Container entfernen
+layout.deleteSection=Delete section
 layout.addApplication=Anwendung hinzufügen
 layout.moveCell=Zelle verschieben
 layout.resizeCell=Zelle skalieren
@@ -80,6 +81,7 @@ layout.fixedHeight500=Hoch (500px)
 layout.fixedHeightCustom=Personalisieren
 layout.invalidFixedHeight=Bitte wählen Sie einen Wert zwischen {0} und {1} px
 layout.hiddenOnMobile=App wird bei der Verwendung des Smartphones ausgeblendet
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Verhalten beim nach unten scrollen
 layout.scrollNoSticky=Keine Fixierung
 layout.scrollStickyLastApp=Letzte App in der Spalte
@@ -335,6 +337,7 @@ layout.gradientFrom=Von
 layout.gradientTo=Bis
 layout.saveDraft=Speichern
 layout.saveDraftTooltip=Seite als Entwurf speichern
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Seitenänderungen veröffentlichen
 layout.readonlyPortletContent=Nur Portlet-Inhalte lesen
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Website, die vorgeschlagen wird, wen
 siteTemplate.label.editNavigation=Navigation bearbeiten
 siteTemplate.label.editCreatedNavigation.information=Vorlage gespeichert! Passen Sie nun Layout und Navigation für jede Seite an
 siteTemplate.label.editNavigation.information=Änderungen betreffen nur neue Websites, die mit diesem Model erstellt wurden
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_el.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_el.properties
index 531faf7b6..3752c8f03 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_el.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_el.properties
@@ -23,6 +23,7 @@ layout.apply=Εφαρμογή
 layout.next=Next
 layout.save=Αποθηκεύσετε
 layout.deleteContainer=Διαγραφή περιέκτη
+layout.deleteSection=Delete section
 layout.addApplication=Προσθήκη Εφαρμογής
 layout.moveCell=Μετακίνηση Κελιού
 layout.resizeCell=Αλλαγή Μεγέθους Κελιού
@@ -80,6 +81,7 @@ layout.fixedHeight500=Υψηλή (500px)
 layout.fixedHeightCustom=Προσαρμοσμένο
 layout.invalidFixedHeight=Παρακαλώ επιλέξτε μια τιμή μεταξύ {0} και {1} px
 layout.hiddenOnMobile=Η εφαρμογή είναι κρυμμένη όταν χρησιμοποιείτε κινητό
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Συμπεριφορά κατά την κύλιση προς τα κάτω
 layout.scrollNoSticky=Μη κολλώδης συμπεριφορά
 layout.scrollStickyLastApp=Τελευταία εφαρμογή στη στήλη
@@ -335,6 +337,7 @@ layout.gradientFrom=Από
 layout.gradientTo=Έως
 layout.saveDraft=Αποθηκεύσετε
 layout.saveDraftTooltip=Αποθήκευση σελίδας ως πρόχειρο
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Δημοσίευση τροποποιήσεων σελίδας
 layout.readonlyPortletContent=Διαβάστε Μόνο Το Περιεχόμενο Του Portlet
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_es_ES.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_es_ES.properties
index 39280fbdd..54cc0b573 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_es_ES.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_es_ES.properties
@@ -23,6 +23,7 @@ layout.apply=Aplicar
 layout.next=Next
 layout.save=Guardar
 layout.deleteContainer=Eliminar contenedor
+layout.deleteSection=Delete section
 layout.addApplication=Añadir aplicación
 layout.moveCell=Mover celda
 layout.resizeCell=Redimensionar celda
@@ -80,6 +81,7 @@ layout.fixedHeight500=Alta (500px)
 layout.fixedHeightCustom=Personalizado
 layout.invalidFixedHeight=Por favor, elija un valor entre {0} y {1} px
 layout.hiddenOnMobile=La aplicación está oculta al usar el móvil
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Comportamiento al deslizarse hacia abajo
 layout.scrollNoSticky=No hay comportamiento fijo
 layout.scrollStickyLastApp=Última aplicación en la columna
@@ -335,6 +337,7 @@ layout.gradientFrom=De
 layout.gradientTo=A
 layout.saveDraft=Guardar
 layout.saveDraftTooltip=Guardar página como borrador
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publicar modificaciones de página
 layout.readonlyPortletContent=Contenido de solo lectura
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_eu.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_eu.properties
index fd0f1f200..8bbed7938 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_eu.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_eu.properties
@@ -23,6 +23,7 @@ layout.apply=Apply
 layout.next=Next
 layout.save=Save
 layout.deleteContainer=Delete container
+layout.deleteSection=Delete section
 layout.addApplication=Add Application
 layout.moveCell=Move Cell
 layout.resizeCell=Resize Cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=High (500px)
 layout.fixedHeightCustom=Custom
 layout.invalidFixedHeight=Please choose a value between {0} and {1} px
 layout.hiddenOnMobile=App is hidden when using mobile
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Behaviour when scrolling down
 layout.scrollNoSticky=No sticky behaviour
 layout.scrollStickyLastApp=Last app in the column
@@ -335,6 +337,7 @@ layout.gradientFrom=From
 layout.gradientTo=To
 layout.saveDraft=Save
 layout.saveDraftTooltip=Save page as draft
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publish page modifications
 layout.readonlyPortletContent=Read Only Portlet Content
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fa.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fa.properties
index ae54b4f74..e1f3f4875 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fa.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fa.properties
@@ -23,6 +23,7 @@ layout.apply=درخواست دادن
 layout.next=Next
 layout.save=ذخيره
 layout.deleteContainer=ظرف را حذف کنید
+layout.deleteSection=Delete section
 layout.addApplication=افزودن برنامه
 layout.moveCell=حرکت سلول
 layout.resizeCell=تغییر اندازه سلول
@@ -80,6 +81,7 @@ layout.fixedHeight500=بالا (500 پیکسل)
 layout.fixedHeightCustom=سفارشی
 layout.invalidFixedHeight=لطفاً مقداری بین {0} و {1} پیکسل انتخاب کنید
 layout.hiddenOnMobile=برنامه هنگام استفاده از تلفن همراه پنهان است
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=رفتار هنگام اسکرول کردن به پایین
 layout.scrollNoSticky=بدون رفتار چسبنده
 layout.scrollStickyLastApp=آخرین برنامه در ستون
@@ -335,6 +337,7 @@ layout.gradientFrom=از
 layout.gradientTo=به
 layout.saveDraft=ذخيره
 layout.saveDraftTooltip=ذخیره صفحه به عنوان پیش نویس
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=انتشار تغییرات صفحه
 layout.readonlyPortletContent=فقط محتوای پورتلت را بخوانید
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fi.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fi.properties
index 39216491e..f9f217ac9 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fi.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fi.properties
@@ -23,6 +23,7 @@ layout.apply=Käytä
 layout.next=Next
 layout.save=Tallenna
 layout.deleteContainer=Poista säiliö
+layout.deleteSection=Delete section
 layout.addApplication=Lisää Sovellus
 layout.moveCell=Siirrä Solu
 layout.resizeCell=Muuta Solun Kokoa
@@ -80,6 +81,7 @@ layout.fixedHeight500=Korkea (500px)
 layout.fixedHeightCustom=Mukautettu
 layout.invalidFixedHeight=Valitse arvo välillä {0} ja {1} px
 layout.hiddenOnMobile=Sovellus on piilotettu, kun käytät mobiilia
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Käyttäytyminen vieritettäessä alas
 layout.scrollNoSticky=Ei tahmea käyttäytyminen
 layout.scrollStickyLastApp=Sarakkeen viimeinen sovellus
@@ -335,6 +337,7 @@ layout.gradientFrom=Alkaen
 layout.gradientTo=Vastaanottaja
 layout.saveDraft=Tallenna
 layout.saveDraftTooltip=Tallenna sivu luonnoksena
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Julkaise sivun muutokset
 layout.readonlyPortletContent=Lue Vain Portletin Sisältöä
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fil.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fil.properties
index e69f68683..119170c20 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fil.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fil.properties
@@ -23,6 +23,7 @@ layout.apply=I-Aplay
 layout.next=Next
 layout.save=I-save
 layout.deleteContainer=Tanggalin ang lalagyan
+layout.deleteSection=Delete section
 layout.addApplication=Magdagdag ng Application
 layout.moveCell=Ilipat ang Cell
 layout.resizeCell=Baguhin ang laki ng Cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=Mataas (500px)
 layout.fixedHeightCustom=Custom
 layout.invalidFixedHeight=Mangyaring pumili ng halaga sa pagitan ng {0} at {1} px
 layout.hiddenOnMobile=Nakatago ang app kapag gumagamit ng mobile
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Pag-uugali kapag nag-scroll pababa
 layout.scrollNoSticky=Walang malagkit na pag-uugali
 layout.scrollStickyLastApp=Huling app sa column
@@ -335,6 +337,7 @@ layout.gradientFrom=Galing sa
 layout.gradientTo=Kay
 layout.saveDraft=I-save
 layout.saveDraftTooltip=I-save ang page bilang draft
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=I-publish ang mga pagbabago sa pahina
 layout.readonlyPortletContent=Read Only Portlet Content
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fr.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fr.properties
index 7faee3f64..9226b9120 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fr.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fr.properties
@@ -23,6 +23,7 @@ layout.apply=Appliquer
 layout.next=Suivant
 layout.save=Enregistrer
 layout.deleteContainer=Supprimer le conteneur
+layout.deleteSection=Delete section
 layout.addApplication=Ajouter une application
 layout.moveCell=Déplacer la cellule
 layout.resizeCell=Redimensionner la cellule
@@ -80,6 +81,7 @@ layout.fixedHeight500=Haute (500px)
 layout.fixedHeightCustom=Personnalisé
 layout.invalidFixedHeight=Veuillez choisir une valeur entre {0} et {1} px
 layout.hiddenOnMobile=L'application est cachée lorsque vous utilisez un téléphone mobile
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Comportement lors du défilement vers le bas
 layout.scrollNoSticky=Aucune application n'est fixée lors du défilement
 layout.scrollStickyLastApp=Dernière application dans la colonne
@@ -335,6 +337,7 @@ layout.gradientFrom=De
 layout.gradientTo=à
 layout.saveDraft=Enregistrer
 layout.saveDraftTooltip=Enregistrer la page comme brouillon
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publier les modifications de page
 layout.readonlyPortletContent=Contenu de portlet en lecture seule
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggéré lorsque les administr
 siteTemplate.label.editNavigation=Modifier la navigation
 siteTemplate.label.editCreatedNavigation.information=Modèle enregistré ! Personnalisez maintenant la mise en page et la navigation pour chaque page de votre site
 siteTemplate.label.editNavigation.information=Les changements n'affectent que les nouveaux sites créés à l'aide de ce modèle
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_hi.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_hi.properties
index fd0f1f200..8bbed7938 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_hi.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_hi.properties
@@ -23,6 +23,7 @@ layout.apply=Apply
 layout.next=Next
 layout.save=Save
 layout.deleteContainer=Delete container
+layout.deleteSection=Delete section
 layout.addApplication=Add Application
 layout.moveCell=Move Cell
 layout.resizeCell=Resize Cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=High (500px)
 layout.fixedHeightCustom=Custom
 layout.invalidFixedHeight=Please choose a value between {0} and {1} px
 layout.hiddenOnMobile=App is hidden when using mobile
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Behaviour when scrolling down
 layout.scrollNoSticky=No sticky behaviour
 layout.scrollStickyLastApp=Last app in the column
@@ -335,6 +337,7 @@ layout.gradientFrom=From
 layout.gradientTo=To
 layout.saveDraft=Save
 layout.saveDraftTooltip=Save page as draft
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publish page modifications
 layout.readonlyPortletContent=Read Only Portlet Content
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_hu.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_hu.properties
index ac8d7c3bb..214c94bf5 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_hu.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_hu.properties
@@ -23,6 +23,7 @@ layout.apply=Jelentkezés
 layout.next=Next
 layout.save=Mentés
 layout.deleteContainer=Tároló törlése
+layout.deleteSection=Delete section
 layout.addApplication=Alkalmazás hozzáadása
 layout.moveCell=Cella mozgatása
 layout.resizeCell=Cella átméretezése
@@ -80,6 +81,7 @@ layout.fixedHeight500=Magas (500 képpont)
 layout.fixedHeightCustom=Szokás
 layout.invalidFixedHeight=Kérjük, válasszon egy értéket {0} és {1} px között
 layout.hiddenOnMobile=Az alkalmazás el van rejtve mobil használatakor
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Viselkedés lefelé görgetéskor
 layout.scrollNoSticky=Nincs ragadós viselkedés
 layout.scrollStickyLastApp=Utolsó alkalmazás az oszlopban
@@ -335,6 +337,7 @@ layout.gradientFrom=A  címről
 layout.gradientTo=A  címre.
 layout.saveDraft=Mentés
 layout.saveDraftTooltip=Oldal mentése piszkozatként
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Az oldal módosításainak közzététele
 layout.readonlyPortletContent=Csak olvasható portlettartalom
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_id.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_id.properties
index 21e8fcbaa..3248be73a 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_id.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_id.properties
@@ -23,6 +23,7 @@ layout.apply=Terapkan
 layout.next=Next
 layout.save=Menyimpan
 layout.deleteContainer=Hapus kontainer
+layout.deleteSection=Delete section
 layout.addApplication=Tambahkan Aplikasi
 layout.moveCell=Pindahkan Sel
 layout.resizeCell=Ubah Ukuran Sel
@@ -80,6 +81,7 @@ layout.fixedHeight500=Tinggi (500 piksel)
 layout.fixedHeightCustom=Kebiasaan
 layout.invalidFixedHeight=Silakan pilih nilai antara {0} dan {1} piksel
 layout.hiddenOnMobile=Aplikasi disembunyikan saat menggunakan ponsel
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Perilaku saat menggulir ke bawah
 layout.scrollNoSticky=Tidak ada perilaku lengket
 layout.scrollStickyLastApp=Aplikasi terakhir di kolom
@@ -335,6 +337,7 @@ layout.gradientFrom=Dari
 layout.gradientTo=Kepada
 layout.saveDraft=Menyimpan
 layout.saveDraftTooltip=Simpan halaman sebagai draf
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publikasikan modifikasi halaman
 layout.readonlyPortletContent=Konten Portlet Hanya Baca
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_it.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_it.properties
index 7803dd5aa..aa3e3a05a 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_it.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_it.properties
@@ -23,6 +23,7 @@ layout.apply=Applicare
 layout.next=Next
 layout.save=Salvi
 layout.deleteContainer=Elimina contenitore
+layout.deleteSection=Delete section
 layout.addApplication=Aggiungi Applicazione
 layout.moveCell=Sposta Cella
 layout.resizeCell=Ridimensiona Cella
@@ -80,6 +81,7 @@ layout.fixedHeight500=Alto (500px)
 layout.fixedHeightCustom=Personalizzato
 layout.invalidFixedHeight=Scegliere un valore tra {0} e {1} px
 layout.hiddenOnMobile=L'app è nascosta quando si utilizza il cellulare
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Comportamento durante lo scorrimento verso il basso
 layout.scrollNoSticky=Nessun comportamento appiccicoso
 layout.scrollStickyLastApp=Ultima app nella colonna
@@ -335,6 +337,7 @@ layout.gradientFrom=Da
 layout.gradientTo=a
 layout.saveDraft=Salvi
 layout.saveDraftTooltip=Salva pagina come bozza
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Pubblica modifiche pagina
 layout.readonlyPortletContent=Contenuto Della Portlet A Sola Lettura
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ja.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ja.properties
index a7791c41b..1e1e9f4a9 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ja.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ja.properties
@@ -23,6 +23,7 @@ layout.apply=適用
 layout.next=Next
 layout.save=保存
 layout.deleteContainer=コンテナを削除
+layout.deleteSection=Delete section
 layout.addApplication=アプリケーションを追加
 layout.moveCell=セルを移動
 layout.resizeCell=セルのサイズ変更
@@ -80,6 +81,7 @@ layout.fixedHeight500=高い (500px)
 layout.fixedHeightCustom=カスタム
 layout.invalidFixedHeight={0} と {1} ピクセルの間の値を選択してください
 layout.hiddenOnMobile=モバイルアプリを使用しているときにアプリを非表示にします
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=下にスクロールするときの動作
 layout.scrollNoSticky=粘着行動なし
 layout.scrollStickyLastApp=列の最後のアプリ
@@ -335,6 +337,7 @@ layout.gradientFrom=開始日
 layout.gradientTo=終了日
 layout.saveDraft=保存
 layout.saveDraftTooltip=下書きとしてページを保存
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=ページの変更を公開
 layout.readonlyPortletContent=ポートレットの内容だけを読み込みます
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ko.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ko.properties
index da7b87f53..a9c0fc51b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ko.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ko.properties
@@ -23,6 +23,7 @@ layout.apply=적용하다
 layout.next=Next
 layout.save=구하다
 layout.deleteContainer=컨테이너 삭제
+layout.deleteSection=Delete section
 layout.addApplication=응용 프로그램 추가
 layout.moveCell=셀 이동
 layout.resizeCell=셀 크기 조정
@@ -80,6 +81,7 @@ layout.fixedHeight500=높음(500px)
 layout.fixedHeightCustom=관습
 layout.invalidFixedHeight={0}와 ​​{1}px 사이의 값을 선택하세요.
 layout.hiddenOnMobile=모바일 사용시 앱이 숨겨짐
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=아래로 스크롤할 때의 동작
 layout.scrollNoSticky=끈적거리는 동작 없음
 layout.scrollStickyLastApp=열의 마지막 앱
@@ -335,6 +337,7 @@ layout.gradientFrom=에서
 layout.gradientTo=에게
 layout.saveDraft=구하다
 layout.saveDraftTooltip=페이지를 초안으로 저장
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=페이지 수정 사항 게시
 layout.readonlyPortletContent=읽기 전용 포틀릿 콘텐츠
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_lt.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_lt.properties
index 6ec4826ba..b84f3077c 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_lt.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_lt.properties
@@ -23,6 +23,7 @@ layout.apply=Taikyti
 layout.next=Next
 layout.save=Išsaugoti
 layout.deleteContainer=Ištrinti sudėtinį rodinį
+layout.deleteSection=Delete section
 layout.addApplication=Pridėti programą
 layout.moveCell=Perkelti langelį
 layout.resizeCell=Keisti langelio dydį
@@ -80,6 +81,7 @@ layout.fixedHeight500=Aukšta (500 piks.)
 layout.fixedHeightCustom=Pasirinktinis
 layout.invalidFixedHeight=Pasirinkite reikšmę nuo {0} iki {1} px
 layout.hiddenOnMobile=Programa paslėpta naudojant mobilųjį telefoną
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Elgesys slenkant žemyn
 layout.scrollNoSticky=Jokio klampaus elgesio
 layout.scrollStickyLastApp=Paskutinė programa stulpelyje
@@ -335,6 +337,7 @@ layout.gradientFrom=Nuo
 layout.gradientTo=Iki
 layout.saveDraft=Išsaugoti
 layout.saveDraftTooltip=Išsaugoti puslapį kaip juodraštį
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Paskelbti puslapio pakeitimus
 layout.readonlyPortletContent=Tik skaitomas portalo turinys
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ms.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ms.properties
index fd0f1f200..8bbed7938 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ms.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ms.properties
@@ -23,6 +23,7 @@ layout.apply=Apply
 layout.next=Next
 layout.save=Save
 layout.deleteContainer=Delete container
+layout.deleteSection=Delete section
 layout.addApplication=Add Application
 layout.moveCell=Move Cell
 layout.resizeCell=Resize Cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=High (500px)
 layout.fixedHeightCustom=Custom
 layout.invalidFixedHeight=Please choose a value between {0} and {1} px
 layout.hiddenOnMobile=App is hidden when using mobile
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Behaviour when scrolling down
 layout.scrollNoSticky=No sticky behaviour
 layout.scrollStickyLastApp=Last app in the column
@@ -335,6 +337,7 @@ layout.gradientFrom=From
 layout.gradientTo=To
 layout.saveDraft=Save
 layout.saveDraftTooltip=Save page as draft
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publish page modifications
 layout.readonlyPortletContent=Read Only Portlet Content
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_nl.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_nl.properties
index 73578259d..e5f5eddbe 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_nl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_nl.properties
@@ -23,6 +23,7 @@ layout.apply=Toepassen
 layout.next=Next
 layout.save=Opslaan
 layout.deleteContainer=Container verwijderen
+layout.deleteSection=Delete section
 layout.addApplication=Toepassing toevoegen
 layout.moveCell=Cel verplaatsen
 layout.resizeCell=Cel grootte
@@ -80,6 +81,7 @@ layout.fixedHeight500=Hoog (500px)
 layout.fixedHeightCustom=Aangepaste
 layout.invalidFixedHeight=Kies een waarde tussen {0} en {1} px
 layout.hiddenOnMobile=App wordt verborgen wanneer je mobiel gebruikt
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Gedrag bij naar beneden scrollen
 layout.scrollNoSticky=Geen sticky gedrag
 layout.scrollStickyLastApp=Laatste app in de kolom
@@ -335,6 +337,7 @@ layout.gradientFrom=Van
 layout.gradientTo=Aan
 layout.saveDraft=Opslaan
 layout.saveDraftTooltip=Pagina als concept opslaan
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Paginawijzigingen publiceren
 layout.readonlyPortletContent=Inhoud van portlet lezen
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_no.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_no.properties
index 74119c01b..1866ef22c 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_no.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_no.properties
@@ -23,6 +23,7 @@ layout.apply=Bruk
 layout.next=Next
 layout.save=Lagre
 layout.deleteContainer=Slett beholder
+layout.deleteSection=Delete section
 layout.addApplication=Legg til applikasjon
 layout.moveCell=Flytt celle
 layout.resizeCell=Endre størrelse celle
@@ -80,6 +81,7 @@ layout.fixedHeight500=Høy (500px)
 layout.fixedHeightCustom=Egendefinert
 layout.invalidFixedHeight=Velg en verdi mellom {0} og {1} px
 layout.hiddenOnMobile=Appen er skjult når du bruker mobil
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Oppførsel når du ruller ned
 layout.scrollNoSticky=Ingen klebrig oppførsel
 layout.scrollStickyLastApp=Siste app i kolonnen
@@ -335,6 +337,7 @@ layout.gradientFrom=Fra
 layout.gradientTo=Til
 layout.saveDraft=Lagre
 layout.saveDraftTooltip=Lagre side som utkast
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publiser sideendringer
 layout.readonlyPortletContent=Les kun portlet innhold
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pcm.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pcm.properties
index fd0f1f200..8bbed7938 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pcm.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pcm.properties
@@ -23,6 +23,7 @@ layout.apply=Apply
 layout.next=Next
 layout.save=Save
 layout.deleteContainer=Delete container
+layout.deleteSection=Delete section
 layout.addApplication=Add Application
 layout.moveCell=Move Cell
 layout.resizeCell=Resize Cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=High (500px)
 layout.fixedHeightCustom=Custom
 layout.invalidFixedHeight=Please choose a value between {0} and {1} px
 layout.hiddenOnMobile=App is hidden when using mobile
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Behaviour when scrolling down
 layout.scrollNoSticky=No sticky behaviour
 layout.scrollStickyLastApp=Last app in the column
@@ -335,6 +337,7 @@ layout.gradientFrom=From
 layout.gradientTo=To
 layout.saveDraft=Save
 layout.saveDraftTooltip=Save page as draft
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publish page modifications
 layout.readonlyPortletContent=Read Only Portlet Content
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pl.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pl.properties
index 8cc4c7daa..071ab4b79 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pl.properties
@@ -23,6 +23,7 @@ layout.apply=Zastosuj
 layout.next=Next
 layout.save=Zapisz
 layout.deleteContainer=Usuń kontener
+layout.deleteSection=Delete section
 layout.addApplication=Dodaj aplikację
 layout.moveCell=Przenieś Ogniwo
 layout.resizeCell=Zmień rozmiar komórki
@@ -80,6 +81,7 @@ layout.fixedHeight500=Wysokie (500px)
 layout.fixedHeightCustom=Własny
 layout.invalidFixedHeight=Proszę wybrać wartość pomiędzy {0} i {1} px
 layout.hiddenOnMobile=Aplikacja jest ukryta podczas korzystania z telefonu komórkowego
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Zachowanie podczas przewijania w dół
 layout.scrollNoSticky=Brak przyklejonych zachowań
 layout.scrollStickyLastApp=Ostatnia aplikacja w kolumnie
@@ -335,6 +337,7 @@ layout.gradientFrom=Od
 layout.gradientTo=Do
 layout.saveDraft=Zapisz
 layout.saveDraftTooltip=Zapisz stronę jako szkic
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Opublikuj modyfikacje strony
 layout.readonlyPortletContent=Tylko do odczytu zawartości portletu
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pt_BR.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pt_BR.properties
index e8a08d77f..3a49efcf0 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pt_BR.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pt_BR.properties
@@ -23,6 +23,7 @@ layout.apply=Aplicar
 layout.next=Next
 layout.save=Salvar
 layout.deleteContainer=Excluir o contêiner
+layout.deleteSection=Delete section
 layout.addApplication=Adicionar aplicativo
 layout.moveCell=Mover Célula
 layout.resizeCell=Redimensionar Célula
@@ -80,6 +81,7 @@ layout.fixedHeight500=Alto (500px)
 layout.fixedHeightCustom=Personalizado
 layout.invalidFixedHeight=Por favor, escolha um valor entre {0} e {1} px
 layout.hiddenOnMobile=O aplicativo está oculto ao usar dispositivos móveis
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Comportamento ao rolar para baixo
 layout.scrollNoSticky=Sem comportamento fixo
 layout.scrollStickyLastApp=Último aplicativo na coluna
@@ -335,6 +337,7 @@ layout.gradientFrom=De
 layout.gradientTo=a
 layout.saveDraft=Salvar
 layout.saveDraftTooltip=Salvar página como rascunho
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publicar modificações da página
 layout.readonlyPortletContent=Conteúdo Somente Leitura do Portlet
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pt_PT.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pt_PT.properties
index 666e0b28c..c9212b336 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pt_PT.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_pt_PT.properties
@@ -23,6 +23,7 @@ layout.apply=Aplicar
 layout.next=Next
 layout.save=Gravar
 layout.deleteContainer=Excluir o contêiner
+layout.deleteSection=Delete section
 layout.addApplication=Adicionar aplicativo
 layout.moveCell=Mover Célula
 layout.resizeCell=Redimensionar Célula
@@ -80,6 +81,7 @@ layout.fixedHeight500=Alto (500px)
 layout.fixedHeightCustom=Personalizado
 layout.invalidFixedHeight=Por favor, escolha um valor entre {0} e {1} px
 layout.hiddenOnMobile=O aplicativo está oculto ao usar dispositivos móveis
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Comportamento ao rolar para baixo
 layout.scrollNoSticky=Sem comportamento fixo
 layout.scrollStickyLastApp=Último aplicativo na coluna
@@ -335,6 +337,7 @@ layout.gradientFrom=De
 layout.gradientTo=a
 layout.saveDraft=Gravar
 layout.saveDraftTooltip=Salvar página como rascunho
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publicar modificações da página
 layout.readonlyPortletContent=Conteúdo Somente Leitura do Portlet
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ro.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ro.properties
index c4334292f..9f11d8b3e 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ro.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ro.properties
@@ -23,6 +23,7 @@ layout.apply=Aplică
 layout.next=Next
 layout.save=Salvaţi
 layout.deleteContainer=Ștergeți containerul
+layout.deleteSection=Delete section
 layout.addApplication=Adaugă aplicație
 layout.moveCell=Mută celula
 layout.resizeCell=Redimensionează celula
@@ -80,6 +81,7 @@ layout.fixedHeight500=Mare (500px)
 layout.fixedHeightCustom=Personalizat
 layout.invalidFixedHeight=Vă rugăm să alegeți o valoare între {0} și {1} px
 layout.hiddenOnMobile=Aplicația este ascunsă atunci când utilizați telefonul mobil
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Comportament la derulare în jos
 layout.scrollNoSticky=Fără comportament lipicios
 layout.scrollStickyLastApp=Ultima aplicație din coloană
@@ -335,6 +337,7 @@ layout.gradientFrom=De la
 layout.gradientTo=Până la
 layout.saveDraft=Salvaţi
 layout.saveDraftTooltip=Salvează pagina ca ciornă
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publicare modificări de pagină
 layout.readonlyPortletContent=Conținut doar portlet-ul de citire
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ru.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ru.properties
index b95d2b8f7..18234254c 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ru.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ru.properties
@@ -23,6 +23,7 @@ layout.apply=Применить
 layout.next=Next
 layout.save=Сохранить
 layout.deleteContainer=Удалить контейнер
+layout.deleteSection=Delete section
 layout.addApplication=Добавить приложение
 layout.moveCell=Переместить Ген
 layout.resizeCell=Изменить размер Ген
@@ -80,6 +81,7 @@ layout.fixedHeight500=Высокий (500px)
 layout.fixedHeightCustom=Свой
 layout.invalidFixedHeight=Пожалуйста, выберите значение между {0} и {1} px
 layout.hiddenOnMobile=Приложение скрыто при использовании мобильного телефона
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Действие при прокрутке вниз
 layout.scrollNoSticky=Нет липкого поведения
 layout.scrollStickyLastApp=Последнее приложение в столбце
@@ -335,6 +337,7 @@ layout.gradientFrom=С
 layout.gradientTo=До
 layout.saveDraft=Сохранить
 layout.saveDraftTooltip=Сохранить страницу как черновик
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Изменить страницу публикации
 layout.readonlyPortletContent=Только чтение содержимого портлета
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sk.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sk.properties
index a931fe80c..ea72926bf 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sk.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sk.properties
@@ -23,6 +23,7 @@ layout.apply=Uplatňovať
 layout.next=Next
 layout.save=Uložiť
 layout.deleteContainer=Odstrániť kontajner
+layout.deleteSection=Delete section
 layout.addApplication=Pridať aplikáciu
 layout.moveCell=Presunúť bunku
 layout.resizeCell=Zmeniť veľkosť bunky
@@ -80,6 +81,7 @@ layout.fixedHeight500=Vysoká (500 pixelov)
 layout.fixedHeightCustom=Vlastné
 layout.invalidFixedHeight=Vyberte hodnotu medzi {0} a {1} px
 layout.hiddenOnMobile=Aplikácia je pri používaní mobilu skrytá
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Správanie pri posúvaní nadol
 layout.scrollNoSticky=Žiadne lepkavé správanie
 layout.scrollStickyLastApp=Posledná aplikácia v stĺpci
@@ -335,6 +337,7 @@ layout.gradientFrom=Z
 layout.gradientTo=Na
 layout.saveDraft=Uložiť
 layout.saveDraftTooltip=Uložiť stránku ako koncept
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publikovať úpravy stránky
 layout.readonlyPortletContent=Obsah portletu len na čítanie
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sl.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sl.properties
index 87ec723a5..f536c9e5d 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sl.properties
@@ -23,6 +23,7 @@ layout.apply=Uporabi
 layout.next=Next
 layout.save=Shrani
 layout.deleteContainer=Izbriši vsebnik
+layout.deleteSection=Delete section
 layout.addApplication=Dodaj aplikacijo
 layout.moveCell=Premakni celico
 layout.resizeCell=Spremeni velikost celice
@@ -80,6 +81,7 @@ layout.fixedHeight500=Visoko (500 slikovnih pik)
 layout.fixedHeightCustom=Po meri
 layout.invalidFixedHeight=Izberite vrednost med {0} in {1} px
 layout.hiddenOnMobile=Aplikacija je pri uporabi mobilne naprave skrita
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Vedenje pri drsenju navzdol
 layout.scrollNoSticky=Brez lepljivega vedenja
 layout.scrollStickyLastApp=Zadnja aplikacija v stolpcu
@@ -335,6 +337,7 @@ layout.gradientFrom=Od
 layout.gradientTo=do
 layout.saveDraft=Shrani
 layout.saveDraftTooltip=Shrani stran kot osnutek
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Objavite spremembe strani
 layout.readonlyPortletContent=Vsebina portalskega programčka samo za branje
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sq.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sq.properties
index f53b33f07..509012233 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sq.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sq.properties
@@ -23,6 +23,7 @@ layout.apply=crwdns30262:0crwdne30262:0
 layout.next=crwdns94378:0crwdne94378:0
 layout.save=crwdns30264:0crwdne30264:0
 layout.deleteContainer=crwdns30266:0crwdne30266:0
+layout.deleteSection=crwdns94830:0crwdne94830:0
 layout.addApplication=crwdns30268:0crwdne30268:0
 layout.moveCell=crwdns30270:0crwdne30270:0
 layout.resizeCell=crwdns30272:0crwdne30272:0
@@ -80,6 +81,7 @@ layout.fixedHeight500=crwdns30374:0crwdne30374:0
 layout.fixedHeightCustom=crwdns30376:0crwdne30376:0
 layout.invalidFixedHeight=crwdns30378:0{0}crwdnd30378:0{1}crwdne30378:0
 layout.hiddenOnMobile=crwdns30380:0crwdne30380:0
+layout.sectionHiddenOnMobile=crwdns94832:0crwdne94832:0
 layout.scrollStickyBehavior=crwdns30382:0crwdne30382:0
 layout.scrollNoSticky=crwdns30384:0crwdne30384:0
 layout.scrollStickyLastApp=crwdns30386:0crwdne30386:0
@@ -335,6 +337,7 @@ layout.gradientFrom=crwdns30854:0crwdne30854:0
 layout.gradientTo=crwdns30856:0crwdne30856:0
 layout.saveDraft=crwdns30858:0crwdne30858:0
 layout.saveDraftTooltip=crwdns30860:0crwdne30860:0
+layout.saveSiteDraftTooltip=crwdns94834:0crwdne94834:0
 layout.publishTooltip=crwdns30862:0crwdne30862:0
 layout.readonlyPortletContent=crwdns30864:0crwdne30864:0
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=crwdns94590:0crwdne94590:0
 siteTemplate.label.editNavigation=crwdns94592:0crwdne94592:0
 siteTemplate.label.editCreatedNavigation.information=crwdns94594:0crwdne94594:0
 siteTemplate.label.editNavigation.information=crwdns94596:0crwdne94596:0
+layout.site.reminder.description.part1=crwdns94836:0crwdne94836:0
+layout.site.reminder.description.part2=crwdns94838:0crwdne94838:0
+layout.site.reminder.description.part3=crwdns94840:0crwdne94840:0
+layout.site.reminder.description.part4=crwdns94842:0crwdne94842:0
+layout.siteSavedSuccessfully=crwdns94844:0crwdne94844:0
+layout.siteDraftSavedSuccessfully=crwdns94846:0crwdne94846:0
+layout.siteSavingError=crwdns94848:0crwdne94848:0
+layout.editSiteName=crwdns94850:0{0}crwdne94850:0
+layout.editSite.portalPage=crwdns94852:0crwdne94852:0
+layout.editSiteProperties=crwdns94854:0crwdne94854:0
+layout.editSiteSections=crwdns94856:0crwdne94856:0
+layout.manageSiteSections=crwdns94858:0crwdne94858:0
+layout.manageSiteSections.description1=crwdns94860:0crwdne94860:0
+layout.manageSiteSections.description2=crwdns94862:0crwdne94862:0
+layout.manageSiteSections.label.preview=crwdns94864:0crwdne94864:0
+layout.manageSiteSections.label.sectionsChoice=crwdns94866:0crwdne94866:0
+layout.manageSiteSections.label.leftSidebar=crwdns94868:0crwdne94868:0
+layout.manageSiteSections.label.internalLeftSidebar=crwdns94870:0crwdne94870:0
+layout.manageSiteSections.label.topBanner=crwdns94872:0crwdne94872:0
+layout.manageSiteSections.label.rightSidebar=crwdns94874:0crwdne94874:0
+layout.manageSiteSections.label.internalRightSidebar=crwdns94876:0crwdne94876:0
+layout.manageSiteSections.label.bottomBanner=crwdns94878:0crwdne94878:0
+layout.editSiteSidebarSection=crwdns94880:0crwdne94880:0
+layout.editSiteSidebarSection.label.setDisplay=crwdns94882:0crwdne94882:0
+layout.editSiteSidebarSection.label.sectionMaxWidth=crwdns94884:0crwdne94884:0
+layout.editSiteSidebarSection.label.sectionHeight=crwdns94886:0crwdne94886:0
+layout.editSiteSidebarSection.label.updateStyle=crwdns94888:0crwdne94888:0
+layout.editSiteBannerSection.label.editSiteTopbarSection=crwdns94890:0crwdne94890:0
+layout.editSiteBannerSection.label.editSiteBottomSection=crwdns94892:0crwdne94892:0
+layout.columnsCount=crwdns94894:0crwdne94894:0
+layout.fixPositionWhenScrolling=crwdns94896:0crwdne94896:0
+layout.applyApplicationWidth=crwdns94898:0crwdne94898:0
+layout.fixedWidth=crwdns94900:0crwdne94900:0
+layout.fixedWidthAutoFill=crwdns94902:0crwdne94902:0
+layout.fixedWidthCustom=crwdns94904:0crwdne94904:0
+layout.invalidFixedWidth=crwdns94906:0{0}crwdnd94906:0{1}crwdne94906:0
+layout.alignApp=crwdns94908:0crwdne94908:0
+layout.alignLeft=crwdns94910:0crwdne94910:0
+layout.alignCenter=crwdns94912:0crwdne94912:0
+layout.alignRight=crwdns94914:0crwdne94914:0
+layout.alignTop=crwdns94916:0crwdne94916:0
+layout.alignMiddle=crwdns94918:0crwdne94918:0
+layout.alignBottom=crwdns94920:0crwdne94920:0
+layout.editSitePagesProperties=crwdns94922:0crwdne94922:0
+layout.updateSitePagesWidth=crwdns94924:0crwdne94924:0
+layout.siteOutdatedError=crwdns94926:0crwdne94926:0
+layout.chooseWhatToDisplay=crwdns94928:0crwdne94928:0
+layout.adjustPortalPageWidth=crwdns94930:0crwdne94930:0
+layout.editSiteLayout=crwdns94932:0crwdne94932:0
+layout.editSiteNavigation=crwdns94934:0crwdne94934:0
+layout.pageMargins=crwdns94936:0crwdne94936:0
+layout.scrollTopColor=crwdns94938:0crwdne94938:0
+layout.scrollMiddleColor=crwdns94940:0crwdne94940:0
+layout.siteDesign=crwdns94942:0crwdne94942:0
+layout.siteBackground=crwdns94944:0crwdne94944:0
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sv_SE.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sv_SE.properties
index f2e0e0336..ceb621bb1 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sv_SE.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_sv_SE.properties
@@ -23,6 +23,7 @@ layout.apply=Tillämpa
 layout.next=Next
 layout.save=Spara
 layout.deleteContainer=Ta bort behållare
+layout.deleteSection=Delete section
 layout.addApplication=Lägg till program
 layout.moveCell=Flytta cell
 layout.resizeCell=Ändra storlek på cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=Hög (500px)
 layout.fixedHeightCustom=Anpassad
 layout.invalidFixedHeight=Välj ett värde mellan {0} och {1} px
 layout.hiddenOnMobile=Appen är dold när mobilen används
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Beteende när man rullar ner
 layout.scrollNoSticky=Inget klibbig beteende
 layout.scrollStickyLastApp=Senaste app i kolumnen
@@ -335,6 +337,7 @@ layout.gradientFrom=Från
 layout.gradientTo=Till
 layout.saveDraft=Spara
 layout.saveDraftTooltip=Spara sida som utkast
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publicera sidändringar
 layout.readonlyPortletContent=Läs endast portletens innehåll
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_th.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_th.properties
index d5d879b83..7f8434168 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_th.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_th.properties
@@ -23,6 +23,7 @@ layout.apply=ยื่นสมัคร
 layout.next=Next
 layout.save=บันทึก
 layout.deleteContainer=ลบคอนเทนเนอร์
+layout.deleteSection=Delete section
 layout.addApplication=เพิ่มแอปพลิเคชัน
 layout.moveCell=ย้ายเซลล์
 layout.resizeCell=ปรับขนาดเซลล์
@@ -80,6 +81,7 @@ layout.fixedHeight500=สูง (500px)
 layout.fixedHeightCustom=กำหนดเอง
 layout.invalidFixedHeight=กรุณาเลือกค่าระหว่าง {0} และ {1} พิกเซล
 layout.hiddenOnMobile=แอปจะถูกซ่อนเมื่อใช้มือถือ
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=การปฏิบัติตัวเมื่อเลื่อนลง
 layout.scrollNoSticky=ไม่มีพฤติกรรมเหนียวหนึบ
 layout.scrollStickyLastApp=แอปสุดท้ายในคอลัมน์
@@ -335,6 +337,7 @@ layout.gradientFrom=จาก
 layout.gradientTo=ไป
 layout.saveDraft=บันทึก
 layout.saveDraftTooltip=บันทึกหน้าเป็นแบบร่าง
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=เผยแพร่การแก้ไขหน้า
 layout.readonlyPortletContent=อ่านเนื้อหาพอร์ตเล็ตเท่านั้น
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_tl.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_tl.properties
index fd0f1f200..8bbed7938 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_tl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_tl.properties
@@ -23,6 +23,7 @@ layout.apply=Apply
 layout.next=Next
 layout.save=Save
 layout.deleteContainer=Delete container
+layout.deleteSection=Delete section
 layout.addApplication=Add Application
 layout.moveCell=Move Cell
 layout.resizeCell=Resize Cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=High (500px)
 layout.fixedHeightCustom=Custom
 layout.invalidFixedHeight=Please choose a value between {0} and {1} px
 layout.hiddenOnMobile=App is hidden when using mobile
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Behaviour when scrolling down
 layout.scrollNoSticky=No sticky behaviour
 layout.scrollStickyLastApp=Last app in the column
@@ -335,6 +337,7 @@ layout.gradientFrom=From
 layout.gradientTo=To
 layout.saveDraft=Save
 layout.saveDraftTooltip=Save page as draft
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publish page modifications
 layout.readonlyPortletContent=Read Only Portlet Content
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_tr.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_tr.properties
index 3a082e0de..f6aad54ce 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_tr.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_tr.properties
@@ -23,6 +23,7 @@ layout.apply=Uygula
 layout.next=Next
 layout.save=Kaydet
 layout.deleteContainer=Konteyneri sil
+layout.deleteSection=Delete section
 layout.addApplication=Uygulama Ekle
 layout.moveCell=Hücreyi Taşı
 layout.resizeCell=Hücreyi Yeniden Boyutlandır
@@ -80,6 +81,7 @@ layout.fixedHeight500=Yüksek (500px)
 layout.fixedHeightCustom=Gelenek
 layout.invalidFixedHeight=Lütfen {0} ile {1} piksel arasında bir değer seçin
 layout.hiddenOnMobile=Mobil kullanıldığında uygulama gizleniyor
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Aşağı kaydırırken davranış
 layout.scrollNoSticky=Yapışkan davranış yok
 layout.scrollStickyLastApp=Sütundaki son uygulama
@@ -335,6 +337,7 @@ layout.gradientFrom=Başlangıç Tarihi
 layout.gradientTo=Bitiş Tarihi
 layout.saveDraft=Kaydet
 layout.saveDraftTooltip=Sayfayı taslak olarak kaydet
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Sayfa değişikliklerini yayınla
 layout.readonlyPortletContent=Salt Okunur Portlet İçeriği
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_uk.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_uk.properties
index f08ba4632..90f0c0d19 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_uk.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_uk.properties
@@ -23,6 +23,7 @@ layout.apply=Застосувати
 layout.next=Next
 layout.save=Зберегти
 layout.deleteContainer=Видалити контейнер
+layout.deleteSection=Delete section
 layout.addApplication=Додати програму
 layout.moveCell=Перемістити клітинку
 layout.resizeCell=Змінити розмір клітинки
@@ -80,6 +81,7 @@ layout.fixedHeight500=Високий (500 пікселів)
 layout.fixedHeightCustom=Користувацька
 layout.invalidFixedHeight=Виберіть значення від {0} до {1} пікселів
 layout.hiddenOnMobile=Додаток приховано при використанні мобільного додатку
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Поведінка при прокручуванні вниз
 layout.scrollNoSticky=Немає приліпленої поведінки
 layout.scrollStickyLastApp=Останній додаток у стовпчику
@@ -335,6 +337,7 @@ layout.gradientFrom=Від
 layout.gradientTo=До
 layout.saveDraft=Зберегти
 layout.saveDraftTooltip=Зберегти сторінку як чернетку
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Опублікувати зміни сторінки
 layout.readonlyPortletContent=Читати лише вміст портлету
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ur_IN.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ur_IN.properties
index fd0f1f200..8bbed7938 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ur_IN.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_ur_IN.properties
@@ -23,6 +23,7 @@ layout.apply=Apply
 layout.next=Next
 layout.save=Save
 layout.deleteContainer=Delete container
+layout.deleteSection=Delete section
 layout.addApplication=Add Application
 layout.moveCell=Move Cell
 layout.resizeCell=Resize Cell
@@ -80,6 +81,7 @@ layout.fixedHeight500=High (500px)
 layout.fixedHeightCustom=Custom
 layout.invalidFixedHeight=Please choose a value between {0} and {1} px
 layout.hiddenOnMobile=App is hidden when using mobile
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Behaviour when scrolling down
 layout.scrollNoSticky=No sticky behaviour
 layout.scrollStickyLastApp=Last app in the column
@@ -335,6 +337,7 @@ layout.gradientFrom=From
 layout.gradientTo=To
 layout.saveDraft=Save
 layout.saveDraftTooltip=Save page as draft
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Publish page modifications
 layout.readonlyPortletContent=Read Only Portlet Content
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_vi.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_vi.properties
index c409691a6..8c6e58d5f 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_vi.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_vi.properties
@@ -23,6 +23,7 @@ layout.apply=Áp dụng
 layout.next=Next
 layout.save=Lưu
 layout.deleteContainer=Xóa container
+layout.deleteSection=Delete section
 layout.addApplication=Thêm ứng dụng
 layout.moveCell=Di chuyển ô
 layout.resizeCell=Thay đổi kích thước ô
@@ -80,6 +81,7 @@ layout.fixedHeight500=Cao (500px)
 layout.fixedHeightCustom=Phong tục
 layout.invalidFixedHeight=Vui lòng chọn giá trị từ {0} đến {1} px
 layout.hiddenOnMobile=Ứng dụng bị ẩn khi sử dụng điện thoại di động
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=Hành vi khi cuộn xuống
 layout.scrollNoSticky=Không có hành vi dính
 layout.scrollStickyLastApp=Ứng dụng cuối cùng trong cột
@@ -335,6 +337,7 @@ layout.gradientFrom=Từ
 layout.gradientTo=Đến
 layout.saveDraft=Lưu
 layout.saveDraftTooltip=Lưu trang dưới dạng bản nháp
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=Xuất bản các sửa đổi trang
 layout.readonlyPortletContent=Nội dung Portlet Chỉ Đọc
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_zh_CN.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_zh_CN.properties
index 191095c96..5d86a9516 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_zh_CN.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_zh_CN.properties
@@ -23,6 +23,7 @@ layout.apply=应用
 layout.next=Next
 layout.save=存储
 layout.deleteContainer=删除容器
+layout.deleteSection=Delete section
 layout.addApplication=添加应用程序
 layout.moveCell=移动单元格
 layout.resizeCell=调整单元格大小
@@ -80,6 +81,7 @@ layout.fixedHeight500=高 (500px)
 layout.fixedHeightCustom=自定义
 layout.invalidFixedHeight=请在 {0} 和 {1} px 之间选择一个值
 layout.hiddenOnMobile=使用移动应用时隐藏应用
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=向下滚动时的行为
 layout.scrollNoSticky=无粘性行为
 layout.scrollStickyLastApp=列中最后一个应用
@@ -335,6 +337,7 @@ layout.gradientFrom=从
 layout.gradientTo=到
 layout.saveDraft=存储
 layout.saveDraftTooltip=保存页面为草稿
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=发布页面修改
 layout.readonlyPortletContent=只读 Portlet 内容
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_zh_TW.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_zh_TW.properties
index 625530fae..c7801416b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_zh_TW.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_zh_TW.properties
@@ -23,6 +23,7 @@ layout.apply=套用
 layout.next=Next
 layout.save=儲存
 layout.deleteContainer=刪除容器
+layout.deleteSection=Delete section
 layout.addApplication=新增應用程式
 layout.moveCell=移動單元格
 layout.resizeCell=調整單元格大小
@@ -80,6 +81,7 @@ layout.fixedHeight500=高（500 像素）
 layout.fixedHeightCustom=風俗
 layout.invalidFixedHeight=請選擇一個介於 {0} 和 {1} 像素之間的值
 layout.hiddenOnMobile=使用手機時應用程式被隱藏
+layout.sectionHiddenOnMobile=Hide when using mobile
 layout.scrollStickyBehavior=向下捲動時的行為
 layout.scrollNoSticky=無黏性行為
 layout.scrollStickyLastApp=該列中的最後一個應用程式
@@ -335,6 +337,7 @@ layout.gradientFrom=從
 layout.gradientTo=至
 layout.saveDraft=儲存
 layout.saveDraftTooltip=將頁面另存為草稿
+layout.saveSiteDraftTooltip=Save site as draft
 layout.publishTooltip=發布頁面修改
 layout.readonlyPortletContent=只讀 Portlet 內容
 
@@ -460,3 +463,58 @@ layout.siteTemplate.spacePublic.description=Site suggested when admins want to c
 siteTemplate.label.editNavigation=Edit navigation
 siteTemplate.label.editCreatedNavigation.information=Your template was saved. You can now edit the layout and navigation for any page.
 siteTemplate.label.editNavigation.information=Changes affect only new sites created using this template
+layout.site.reminder.description.part1=Now, with just a few clicks, design your site using our full-fledged Site Builder and enjoy the benefits of a modern experience:
+layout.site.reminder.description.part2=- Organize Site in Sections
+layout.site.reminder.description.part3=- Manage Apps Display
+layout.site.reminder.description.part4=- Preview Site Content
+layout.siteSavedSuccessfully=Site Saved Successfully
+layout.siteDraftSavedSuccessfully=Site draft saved successfully
+layout.siteSavingError=An error occurred while saving site. Please try again later or contact the support services.
+layout.editSiteName=Edit {0}
+layout.editSite.portalPage=Page
+layout.editSiteProperties=Edit site design
+layout.editSiteSections=Edit sections
+layout.manageSiteSections=Manage Site Sections
+layout.manageSiteSections.description1=Each section can be updated one by one. However, once hidden, you can make it visible again using options below.
+layout.manageSiteSections.description2=Portal Page Section cannot be hidden.
+layout.manageSiteSections.label.preview=Preview
+layout.manageSiteSections.label.sectionsChoice=Choose sections to display
+layout.manageSiteSections.label.leftSidebar=Left
+layout.manageSiteSections.label.internalLeftSidebar=Internal Left
+layout.manageSiteSections.label.topBanner=Top
+layout.manageSiteSections.label.rightSidebar=Right
+layout.manageSiteSections.label.internalRightSidebar=Internal Right
+layout.manageSiteSections.label.bottomBanner=Bottom
+layout.editSiteSidebarSection=Edit Site Sidebar Section
+layout.editSiteSidebarSection.label.setDisplay=Set Display
+layout.editSiteSidebarSection.label.sectionMaxWidth=Section max-width
+layout.editSiteSidebarSection.label.sectionHeight=Section Height
+layout.editSiteSidebarSection.label.updateStyle=Update Style
+layout.editSiteBannerSection.label.editSiteTopbarSection=Edit Site Topbar Section
+layout.editSiteBannerSection.label.editSiteBottomSection=Edit Site Bottom Section
+layout.columnsCount=Columns Number
+layout.fixPositionWhenScrolling=Fix Position when Scrolling
+layout.applyApplicationWidth=Apply App Width
+layout.fixedWidth=Fixed Width
+layout.fixedWidthAutoFill=Adjust to application content
+layout.fixedWidthCustom=Custom
+layout.invalidFixedWidth=Please choose a value between {0} and {1} px
+layout.alignApp=Align App
+layout.alignLeft=Left
+layout.alignCenter=Center
+layout.alignRight=Right
+layout.alignTop=Top
+layout.alignMiddle=Middle
+layout.alignBottom=Bottom
+layout.editSitePagesProperties=Edit site pages design
+layout.updateSitePagesWidth=Update Width
+layout.siteOutdatedError=The current site version seems to be outdated. Please try again by refreshing the page or check if another session is ongoing (another browser tab) or contact the support services.
+layout.chooseWhatToDisplay=Choose what to display
+layout.adjustPortalPageWidth=Adjust Page width
+layout.editSiteLayout=Edit Site Layout
+layout.editSiteNavigation=Edit Site Navigation
+layout.pageMargins=Page Margins
+layout.scrollTopColor=Top
+layout.scrollMiddleColor=On scroll
+layout.siteDesign=Site Design
+layout.siteBackground=Site Background
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ar.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ar.properties
index e29112b7c..d9ff3ca53 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ar.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ar.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=هل أنت متحقِّق من أن
 siteManagement.drawer.properties.title=خصائص الموقع
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=الخصائص
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=اسم الموقع
 siteManagement.label.siteLabel.title=تسمية الموقع
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=وصف الموقع
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=الواجهة
 siteManagement.label.manageAccess=الصلاحيّات
 siteManagement.label.managePermissions=إدارة الصلاحيات
 siteManagement.label.updatePermission.error=حدث خطأ أثناء تحديث الأذونات
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_aro.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_aro.properties
index e29112b7c..d9ff3ca53 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_aro.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_aro.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=هل أنت متحقِّق من أن
 siteManagement.drawer.properties.title=خصائص الموقع
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=الخصائص
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=اسم الموقع
 siteManagement.label.siteLabel.title=تسمية الموقع
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=وصف الموقع
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=الواجهة
 siteManagement.label.manageAccess=الصلاحيّات
 siteManagement.label.managePermissions=إدارة الصلاحيات
 siteManagement.label.updatePermission.error=حدث خطأ أثناء تحديث الأذونات
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_az.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_az.properties
index 478873f5c..f96b2d48b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_az.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_az.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Are you sure you want to delete "{0}"
 siteManagement.drawer.properties.title=Site properties
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Properties
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site name
 siteManagement.label.siteLabel.title=Site label
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site description
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Permissions
 siteManagement.label.managePermissions=Manage permissions
 siteManagement.label.updatePermission.error=Error while updating permissions
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ca.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ca.properties
index 925c15065..818233afa 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ca.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ca.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Esteu segur que voleu suprimir el llo
 siteManagement.drawer.properties.title=Propietats del lloc
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Propietats
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Nom del lloc
 siteManagement.label.siteLabel.title=Etiqueta del lloc
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Descripció del lloc
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Disseny
 siteManagement.label.manageAccess=Permisos
 siteManagement.label.managePermissions=Gestionar els permisos
 siteManagement.label.updatePermission.error=S'ha produït un error en actualitzar els permisos
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ceb.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ceb.properties
index 478873f5c..f96b2d48b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ceb.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ceb.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Are you sure you want to delete "{0}"
 siteManagement.drawer.properties.title=Site properties
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Properties
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site name
 siteManagement.label.siteLabel.title=Site label
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site description
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Permissions
 siteManagement.label.managePermissions=Manage permissions
 siteManagement.label.updatePermission.error=Error while updating permissions
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_co.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_co.properties
index accf5ffcc..bbdab77ba 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_co.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_co.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Sò sicuru chì vulete sguassà u sit
 siteManagement.drawer.properties.title=Proprietà di u situ
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Pruprietà
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Nome di u situ
 siteManagement.label.siteLabel.title=Etichetta di u situ
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Descrizzione di u situ
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Disposizione
 siteManagement.label.manageAccess=Dozvole
 siteManagement.label.managePermissions=Gestisce i permessi
 siteManagement.label.updatePermission.error=Errore durante l'aghjurnamentu di i permessi
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_cs.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_cs.properties
index 363a30202..5f4ebc996 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_cs.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_cs.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Jste si jisti, že chcete odstranit "
 siteManagement.drawer.properties.title=Vlastnosti webu
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Vlastnosti
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Název webu
 siteManagement.label.siteLabel.title=Popisek webu
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Popis stránky
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Rozložení
 siteManagement.label.manageAccess=Oprávnění
 siteManagement.label.managePermissions=Spravovat oprávnění
 siteManagement.label.updatePermission.error=Chyba při aktualizaci oprávnění
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_de.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_de.properties
index 99cea01f4..f36294c14 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_de.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_de.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Sind Sie sicher, dass Sie diese "{0}"
 siteManagement.drawer.properties.title=Seiten-Eigenschaften
 siteManagement.drawer.addSite.title=Website hinzufügen
 siteManagement.label.properties=Eigenschaften
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Seitenname
 siteManagement.label.siteLabel.title=Seiten-Label
 siteManagement.label.siteLabel.placeholder=Geben Sie Ihrer Website einen Namen
 siteManagement.label.siteDescription.title=Seitenbeschreibung
 siteManagement.label.siteDescription.placeholder=Beschreiben Sie den Zweck. Dieser wird dem Benutzer in der Seitenleiste angezeigt.
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Zugriffsberechtigungen
 siteManagement.label.managePermissions=Zugriffsberechtigungen verwalten
 siteManagement.label.updatePermission.error=Fehler beim Aktualisieren der Zugangsberechtigungen
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Seitenberechtigungen
 sites.label.siteNavigation=Seitennavigation
 sites.filter.placeholder=Nach Namen oder Beschreibung filtern
 sites.label.system.noDelete=Diese Standard-Website kann nicht gelöscht werden
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Offen
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=Nach der Erstellung kann dies nicht aktualisiert werden 
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Model auswählen
 sites.duplicate=Duplizieren
 sites.created.information=Website erstellt! Passen Sie Layout und Navigation für jede Seite an
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_el.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_el.properties
index 0a2028c85..912265ba1 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_el.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_el.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Είστε βέβαιοι ότι θέ
 siteManagement.drawer.properties.title=Ιδιότητες ιστοσελίδας
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Ιδιότητες
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Όνομα ιστοτόπου
 siteManagement.label.siteLabel.title=Ετικέτα ιστοτόπου
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Περιγραφή τοποθεσίας
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Διάταξη
 siteManagement.label.manageAccess=Δικαιώματα
 siteManagement.label.managePermissions=Διαχείριση δικαιωμάτων
 siteManagement.label.updatePermission.error=Σφάλμα κατά την ενημέρωση δικαιωμάτων
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_en.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_en.properties
index f369a56b8..f96b2d48b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_en.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_en.properties
@@ -11,7 +11,7 @@ siteManagement.label.confirmDelete.message=Are you sure you want to delete "{0}"
 siteManagement.drawer.properties.title=Site properties
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Properties
-siteManagement.label.editLayout=Properties
+siteManagement.label.editLayout=Edit Layout
 siteManagement.label.restoreSiteLayout=Restore Site Layout
 siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site name
@@ -19,7 +19,6 @@ siteManagement.label.siteLabel.title=Site label
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site description
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Edit Layout
 siteManagement.label.manageAccess=Permissions
 siteManagement.label.managePermissions=Manage permissions
 siteManagement.label.updatePermission.error=Error while updating permissions
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_es_ES.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_es_ES.properties
index 43ee1ea30..f698b2070 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_es_ES.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_es_ES.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=¿Está seguro que desea eliminar el
 siteManagement.drawer.properties.title=Propiedades del sitio
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Propiedades
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Nombre del sitio
 siteManagement.label.siteLabel.title=Etiqueta del sitio
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Descripción del sitio
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Diseño
 siteManagement.label.manageAccess=Permisos
 siteManagement.label.managePermissions=Administrar permisos
 siteManagement.label.updatePermission.error=Error al actualizar los permisos
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_eu.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_eu.properties
index 478873f5c..f96b2d48b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_eu.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_eu.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Are you sure you want to delete "{0}"
 siteManagement.drawer.properties.title=Site properties
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Properties
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site name
 siteManagement.label.siteLabel.title=Site label
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site description
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Permissions
 siteManagement.label.managePermissions=Manage permissions
 siteManagement.label.updatePermission.error=Error while updating permissions
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fa.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fa.properties
index 07b394bf2..1dc189c0c 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fa.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fa.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=آیا مطمئن هستید که م
 siteManagement.drawer.properties.title=خواص سایت
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=خواص
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=نام سایت
 siteManagement.label.siteLabel.title=برچسب سایت
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=توضیحات سایت
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=طرح بندی
 siteManagement.label.manageAccess=مجوز
 siteManagement.label.managePermissions=مجوزها را مدیریت کنید
 siteManagement.label.updatePermission.error=خطا هنگام به‌روزرسانی مجوزها
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fi.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fi.properties
index f160a786b..6e884a0f0 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fi.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fi.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Oletko varma, että haluat poistaa "{
 siteManagement.drawer.properties.title=Sivuston ominaisuudet
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Ominaisuudet
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Sivuston nimi
 siteManagement.label.siteLabel.title=Sivuston otsikko
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Sivuston kuvaus
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Asettelu
 siteManagement.label.manageAccess=Käyttöoikeudet
 siteManagement.label.managePermissions=Hallitse käyttöoikeuksia
 siteManagement.label.updatePermission.error=Virhe päivitettäessä käyttöoikeuksia
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fil.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fil.properties
index 02bc50ac3..1034eaacf 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fil.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fil.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Sigurado ka bang gusto mong tanggalin
 siteManagement.drawer.properties.title=Mga katangian ng site
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Mga Katangian
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Pangalan ng site
 siteManagement.label.siteLabel.title=Label ng site
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Paglalarawan ng site
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Ang mga Permiso
 siteManagement.label.managePermissions=Pamahalaan ang mga pahintulot
 siteManagement.label.updatePermission.error=Error habang ina-update ang mga pahintulot
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fr.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fr.properties
index 69acb80ed..681cd748f 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fr.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_fr.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Êtes-vous sûr de vouloir supprimer
 siteManagement.drawer.properties.title=Propriétés du site
 siteManagement.drawer.addSite.title=Ajouter un site
 siteManagement.label.properties=Proprietés
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Nom du site
 siteManagement.label.siteLabel.title=Label du site
 siteManagement.label.siteLabel.placeholder=Donner un nom à votre site
 siteManagement.label.siteDescription.title=Description du site
 siteManagement.label.siteDescription.placeholder=Décrire le but pour informer les utilisateurs via la barre latérale
-siteManagement.label.editLayout=Mise en Page
 siteManagement.label.manageAccess=Permissions
 siteManagement.label.managePermissions=Gérer les permissions
 siteManagement.label.updatePermission.error=Erreur lors de la mise à jour des permissions
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Autorisations du site
 sites.label.siteNavigation=Navigation du site
 sites.filter.placeholder=Filtrer par nom
 sites.label.system.noDelete=Ce site par défaut ne peut pas être supprimé
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Ouvrir
 sites.urlSlug.label=URL simplifiée
 sites.urlSlug.caption=Ceci ne peut pas être mis à jour une fois créé
@@ -62,3 +66,7 @@ sites.stepper.start=Commencer
 sites.selectTemplate=Sélectionner un modèle
 sites.duplicate=Dupliquer
 sites.created.information=Site créé ! Personnalisez maintenant la disposition et la navigation pour chaque page du site
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hi.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hi.properties
index 478873f5c..f96b2d48b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hi.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hi.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Are you sure you want to delete "{0}"
 siteManagement.drawer.properties.title=Site properties
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Properties
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site name
 siteManagement.label.siteLabel.title=Site label
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site description
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Permissions
 siteManagement.label.managePermissions=Manage permissions
 siteManagement.label.updatePermission.error=Error while updating permissions
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hu.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hu.properties
index 3f748bc0e..97cd43d6b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hu.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_hu.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Biztosan törli a(z) "{0}" webhelyet?
 siteManagement.drawer.properties.title=A webhely tulajdonságai
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Tulajdonságok
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site name
 siteManagement.label.siteLabel.title=Webhely címke
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=A webhely leírása
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Elrendezés
 siteManagement.label.manageAccess=Engedélyek
 siteManagement.label.managePermissions=Engedélyek kezelése
 siteManagement.label.updatePermission.error=Hiba az engedélyek frissítésekor
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_id.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_id.properties
index dcca482d3..85b2e568a 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_id.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_id.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Apakah Anda yakin ingin menghapus sit
 siteManagement.drawer.properties.title=Properti situs
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Properti
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Nama situs
 siteManagement.label.siteLabel.title=Label situs
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Deskripsi situs
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Tata letak
 siteManagement.label.manageAccess=Perizinan
 siteManagement.label.managePermissions=Mengelola izin
 siteManagement.label.updatePermission.error=Kesalahan saat memperbarui izin
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_it.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_it.properties
index bd52f4e9a..10d0b1861 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_it.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_it.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=È sicura di voler eliminare il sito
 siteManagement.drawer.properties.title=Proprietà del sito
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Proprietà
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Nome del sito
 siteManagement.label.siteLabel.title=Etichetta del sito
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Descrizione del sito
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Autorizzazioni
 siteManagement.label.managePermissions=Gestire le autorizzazioni
 siteManagement.label.updatePermission.error=Errore durante l'aggiornamento delle autorizzazioni
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ja.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ja.properties
index f1ccada9e..e756c8a43 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ja.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ja.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message="{0}" サイトを削除してもよ
 siteManagement.drawer.properties.title=サイトプロパティ
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=プロパティー
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=サイト名
 siteManagement.label.siteLabel.title=サイトラベル
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=サイトの説明
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=レイアウト
 siteManagement.label.manageAccess=パーミッション
 siteManagement.label.managePermissions=権限の管理
 siteManagement.label.updatePermission.error=権限の更新中にエラーが発生しました
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ko.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ko.properties
index d1885c90c..68964bc0c 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ko.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ko.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message="{0}" 사이트를 삭제하시겠습
 siteManagement.drawer.properties.title=사이트 속성
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=속성
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=사이트 이름
 siteManagement.label.siteLabel.title=사이트 라벨
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=사이트 설명
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=공들여 나열한 것
 siteManagement.label.manageAccess=권한
 siteManagement.label.managePermissions=권한 관리
 siteManagement.label.updatePermission.error=권한을 업데이트하는 동안 오류가 발생했습니다.
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_lt.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_lt.properties
index dbead7f8e..fd83a3b13 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_lt.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_lt.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Ar tikrai norite ištrinti „{0}“
 siteManagement.drawer.properties.title=Svetainės ypatybės
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Savybės
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Svetainės pavadinimas
 siteManagement.label.siteLabel.title=Svetainės etiketė
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Svetainės aprašymas
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Išdėstymas
 siteManagement.label.manageAccess=Teisės
 siteManagement.label.managePermissions=Tvarkyti leidimus
 siteManagement.label.updatePermission.error=Klaida atnaujinant leidimus
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ms.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ms.properties
index 478873f5c..f96b2d48b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ms.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ms.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Are you sure you want to delete "{0}"
 siteManagement.drawer.properties.title=Site properties
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Properties
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site name
 siteManagement.label.siteLabel.title=Site label
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site description
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Permissions
 siteManagement.label.managePermissions=Manage permissions
 siteManagement.label.updatePermission.error=Error while updating permissions
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_nl.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_nl.properties
index dfa6b9499..cad8df23f 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_nl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_nl.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Weet u zeker dat u de site "{0}" wilt
 siteManagement.drawer.properties.title=Site eigenschappen
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Eigenschappen
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Naam site:
 siteManagement.label.siteLabel.title=Site label
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Website beschrijving
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Indeling
 siteManagement.label.manageAccess=Machtiging
 siteManagement.label.managePermissions=Machtigingen beheren
 siteManagement.label.updatePermission.error=Fout bij het bijwerken van rechten
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_no.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_no.properties
index 105e7daf4..f5d914bcc 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_no.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_no.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Er du sikker på at du vil slette "{0
 siteManagement.drawer.properties.title=Egenskaper for nettsted
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Egenskaper
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Sidens navn
 siteManagement.label.siteLabel.title=Etikett for nettsted
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Beskrivelse av nettstedet
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Oppsett
 siteManagement.label.manageAccess=Tilganger
 siteManagement.label.managePermissions=Administrer tillatelser
 siteManagement.label.updatePermission.error=Feil under oppdatering av tillatelser
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pcm.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pcm.properties
index 478873f5c..f96b2d48b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pcm.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pcm.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Are you sure you want to delete "{0}"
 siteManagement.drawer.properties.title=Site properties
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Properties
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site name
 siteManagement.label.siteLabel.title=Site label
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site description
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Permissions
 siteManagement.label.managePermissions=Manage permissions
 siteManagement.label.updatePermission.error=Error while updating permissions
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pl.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pl.properties
index b37da7841..a70d60b4e 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pl.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Czy na pewno chcesz usunąć witrynę
 siteManagement.drawer.properties.title=Właściwości witryny
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Właściwości
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Nazwa witryny
 siteManagement.label.siteLabel.title=Etykieta witryny
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Opis witryny
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Układ
 siteManagement.label.manageAccess=Uprawnienie
 siteManagement.label.managePermissions=Zarządzaj uprawnieniami
 siteManagement.label.updatePermission.error=Błąd podczas aktualizacji uprawnień
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_BR.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_BR.properties
index 492a55c34..83bc53672 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_BR.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_BR.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Tem certeza que deseja excluir o site
 siteManagement.drawer.properties.title=Propriedades do site
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=propriedades
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Nome do site
 siteManagement.label.siteLabel.title=Rótulo do site
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Descrição do site
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Disposição
 siteManagement.label.manageAccess=Permissão
 siteManagement.label.managePermissions=Gerenciar permissões
 siteManagement.label.updatePermission.error=Erro ao atualizar permissões
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_PT.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_PT.properties
index 0a450e61b..bbe69440f 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_PT.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_pt_PT.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Tem certeza que deseja excluir o site
 siteManagement.drawer.properties.title=Propriedades do site
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=propriedades
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Nome do site
 siteManagement.label.siteLabel.title=Rótulo do site
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Descrição do site
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Disposição
 siteManagement.label.manageAccess=Permissões
 siteManagement.label.managePermissions=Gerenciar permissões
 siteManagement.label.updatePermission.error=Erro ao atualizar permissões
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ro.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ro.properties
index 03d34aa62..69911192c 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ro.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ro.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Sunteţi sigur că doriţi să şterg
 siteManagement.drawer.properties.title=Proprietăți site
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Proprietăți
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Numele site-ului
 siteManagement.label.siteLabel.title=Etichetă site
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Descriere site
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Aspect
 siteManagement.label.manageAccess=Permisiunea
 siteManagement.label.managePermissions=Gestionare permisiuni
 siteManagement.label.updatePermission.error=Eroare în timpul actualizării permisiunilor
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ru.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ru.properties
index 95a0dce6d..5a1c7d383 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ru.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ru.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Вы уверены, что хоти
 siteManagement.drawer.properties.title=Свойства сайта
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Свойства
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Название сайта
 siteManagement.label.siteLabel.title=Метка сайта
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Описание сайта
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Макет
 siteManagement.label.manageAccess=Права доступа
 siteManagement.label.managePermissions=Управление правами доступа
 siteManagement.label.updatePermission.error=Ошибка при обновлении разрешений
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sk.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sk.properties
index 36b48a67c..c703126d8 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sk.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sk.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Naozaj chcete odstrániť stránku 
 siteManagement.drawer.properties.title=Vlastnosti lokality
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Vlastnosti
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Názov lokality
 siteManagement.label.siteLabel.title=Štítok lokality
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Popis lokality
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Rozloženie
 siteManagement.label.manageAccess=Povolenia
 siteManagement.label.managePermissions=Spravovať povolenia
 siteManagement.label.updatePermission.error=Chyba pri aktualizácii povolení
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sl.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sl.properties
index b8088e381..6e7efc259 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sl.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Ali ste prepričani, da želite izbri
 siteManagement.drawer.properties.title=Lastnosti spletnega mesta
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Lastnosti
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Ime spletnega mesta
 siteManagement.label.siteLabel.title=Oznaka spletnega mesta
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Opis mesta
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Postavitev
 siteManagement.label.manageAccess=Dovoljenja
 siteManagement.label.managePermissions=Upravljanje dovoljenj
 siteManagement.label.updatePermission.error=Napaka pri posodabljanju dovoljenj
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sq.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sq.properties
index 657d2236e..89c90f00c 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sq.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sq.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=crwdns30156:0{0}crwdne30156:0
 siteManagement.drawer.properties.title=crwdns30158:0crwdne30158:0
 siteManagement.drawer.addSite.title=crwdns94600:0crwdne94600:0
 siteManagement.label.properties=crwdns30160:0crwdne30160:0
+siteManagement.label.editLayout=crwdns30168:0crwdne30168:0
+siteManagement.label.restoreSiteLayout=crwdns94946:0crwdne94946:0
+siteManagement.label.restoreSitePages=crwdns94948:0crwdne94948:0
 siteManagement.label.siteName.title=crwdns30162:0crwdne30162:0
 siteManagement.label.siteLabel.title=crwdns30164:0crwdne30164:0
 siteManagement.label.siteLabel.placeholder=crwdns94602:0crwdne94602:0
 siteManagement.label.siteDescription.title=crwdns30166:0crwdne30166:0
 siteManagement.label.siteDescription.placeholder=crwdns94604:0crwdne94604:0
-siteManagement.label.editLayout=crwdns30168:0crwdne30168:0
 siteManagement.label.manageAccess=crwdns30170:0crwdne30170:0
 siteManagement.label.managePermissions=crwdns30172:0crwdne30172:0
 siteManagement.label.updatePermission.error=crwdns30178:0crwdne30178:0
@@ -50,6 +52,8 @@ sites.label.sitePermissions=crwdns94620:0crwdne94620:0
 sites.label.siteNavigation=crwdns94622:0crwdne94622:0
 sites.filter.placeholder=crwdns94624:0crwdne94624:0
 sites.label.system.noDelete=crwdns94626:0crwdne94626:0
+sites.label.system.noLayoutEdit=crwdns94950:0crwdne94950:0
+sites.label.meta.noLayoutEdit=crwdns94952:0crwdne94952:0
 sites.menu.open=crwdns94628:0crwdne94628:0
 sites.urlSlug.label=crwdns94630:0crwdne94630:0
 sites.urlSlug.caption=crwdns94632:0crwdne94632:0
@@ -62,3 +66,7 @@ sites.stepper.start=crwdns94644:0crwdne94644:0
 sites.selectTemplate=crwdns94646:0crwdne94646:0
 sites.duplicate=crwdns94648:0crwdne94648:0
 sites.created.information=crwdns94650:0crwdne94650:0
+siteManagement.label.restoreSiteLayout.success=crwdns94954:0crwdne94954:0
+siteManagement.label.restoreSiteLayout.error=crwdns94956:0crwdne94956:0
+siteManagement.label.restoreSitePages.success=crwdns94958:0crwdne94958:0
+siteManagement.label.restoreSitePages.error=crwdns94960:0crwdne94960:0
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sv_SE.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sv_SE.properties
index e0bddf562..e28ea3dfa 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sv_SE.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_sv_SE.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Är du säker på att du vill ta bort
 siteManagement.drawer.properties.title=Egenskaper för sajten
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Egenskaper
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Webbplatsens namn
 siteManagement.label.siteLabel.title=Webbplatsens etikett
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site Beskrivning
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Behörighet
 siteManagement.label.managePermissions=Hantera behörigheter
 siteManagement.label.updatePermission.error=Fel vid uppdatering av behörigheter
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_th.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_th.properties
index 1489c12e2..d8ada7916 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_th.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_th.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=คุณแน่ใจหรือ
 siteManagement.drawer.properties.title=คุณสมบัติของไซต์
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=คุณสมบัติ
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=ชื่อไซต์
 siteManagement.label.siteLabel.title=ป้ายกำกับไซต์
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=คำอธิบายไซต์
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=เค้าโครง
 siteManagement.label.manageAccess=สิทธิ์
 siteManagement.label.managePermissions=จัดการสิทธิ์
 siteManagement.label.updatePermission.error=เกิดข้อผิดพลาดขณะอัปเดตสิทธิ์
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tl.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tl.properties
index 478873f5c..f96b2d48b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tl.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tl.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Are you sure you want to delete "{0}"
 siteManagement.drawer.properties.title=Site properties
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Properties
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site name
 siteManagement.label.siteLabel.title=Site label
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site description
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Permissions
 siteManagement.label.managePermissions=Manage permissions
 siteManagement.label.updatePermission.error=Error while updating permissions
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tr.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tr.properties
index 3151754c4..7a72945ed 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tr.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_tr.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message="{0}" sitesini silmek istediğinizden
 siteManagement.drawer.properties.title=Site özellikleri
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Özellikler
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site adı
 siteManagement.label.siteLabel.title=Site etiketi
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site açıklaması
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Düzen
 siteManagement.label.manageAccess=İzinler
 siteManagement.label.managePermissions=İzinleri yönet
 siteManagement.label.updatePermission.error=İzinler güncellenirken hata oluştu
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_uk.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_uk.properties
index 0367fa798..60a9716c9 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_uk.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_uk.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Ви впевнені, що бажа
 siteManagement.drawer.properties.title=Властивості сайту
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Властивості
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Назва сайту
 siteManagement.label.siteLabel.title=Назва сайту
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Опис сайту
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Макет
 siteManagement.label.manageAccess=Права доступу
 siteManagement.label.managePermissions=Управління дозволами
 siteManagement.label.updatePermission.error=Помилка при оновленні дозволів
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ur_IN.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ur_IN.properties
index 478873f5c..f96b2d48b 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ur_IN.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_ur_IN.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Are you sure you want to delete "{0}"
 siteManagement.drawer.properties.title=Site properties
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Properties
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Site name
 siteManagement.label.siteLabel.title=Site label
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Site description
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Layout
 siteManagement.label.manageAccess=Permissions
 siteManagement.label.managePermissions=Manage permissions
 siteManagement.label.updatePermission.error=Error while updating permissions
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_vi.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_vi.properties
index 20b1f9f1b..3684df66c 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_vi.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_vi.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=Bạn có chắc chắn muốn xóa t
 siteManagement.drawer.properties.title=Thuộc tính trang web
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=Của cải
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=Tên trang web
 siteManagement.label.siteLabel.title=Nhãn trang web
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=Mô tả trang web
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=Cách trình bày
 siteManagement.label.manageAccess=Phân quyền
 siteManagement.label.managePermissions=Quản lý quyền
 siteManagement.label.updatePermission.error=Lỗi khi cập nhật quyền
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_CN.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_CN.properties
index 837d72831..46405d6f5 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_CN.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_CN.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=您确定要删除 "{0}" 站点吗？
 siteManagement.drawer.properties.title=站点属性
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=属性
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=站点名称
 siteManagement.label.siteLabel.title=站点标签
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=站点描述
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=布局
 siteManagement.label.manageAccess=权限
 siteManagement.label.managePermissions=管理权限
 siteManagement.label.updatePermission.error=更新权限时出错
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.
diff --git a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_TW.properties b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_TW.properties
index 0c1f57e6f..5f8b9e21e 100644
--- a/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_TW.properties
+++ b/layout-webapp/src/main/resources/locale/portlet/SiteManagement_zh_TW.properties
@@ -11,12 +11,14 @@ siteManagement.label.confirmDelete.message=您確定要刪除「{0}」網站嗎
 siteManagement.drawer.properties.title=網站屬性
 siteManagement.drawer.addSite.title=Add Site
 siteManagement.label.properties=特性
+siteManagement.label.editLayout=Edit Layout
+siteManagement.label.restoreSiteLayout=Restore Site Layout
+siteManagement.label.restoreSitePages=Restore Default Pages
 siteManagement.label.siteName.title=網站名稱
 siteManagement.label.siteLabel.title=網站標籤
 siteManagement.label.siteLabel.placeholder=Give a name to your site
 siteManagement.label.siteDescription.title=站點描述
 siteManagement.label.siteDescription.placeholder=Describe purpose to inform users via the sidebar
-siteManagement.label.editLayout=佈局
 siteManagement.label.manageAccess=權限
 siteManagement.label.managePermissions=管理權限
 siteManagement.label.updatePermission.error=更新權限時出錯
@@ -50,6 +52,8 @@ sites.label.sitePermissions=Site permissions
 sites.label.siteNavigation=Site navigation
 sites.filter.placeholder=Filter by name, description
 sites.label.system.noDelete=This default site cannot be deleted
+sites.label.system.noLayoutEdit=This site cannot be edited
+sites.label.meta.noLayoutEdit=This site is sharing the layout of your meta site
 sites.menu.open=Open
 sites.urlSlug.label=URL Slug
 sites.urlSlug.caption=This can't be updated once created
@@ -62,3 +66,7 @@ sites.stepper.start=Start
 sites.selectTemplate=Select a template
 sites.duplicate=Duplicate
 sites.created.information=Site created! Now customize the layout and navigation for each site's page
+siteManagement.label.restoreSiteLayout.success=Site Layout restored successfully
+siteManagement.label.restoreSiteLayout.error=An error occurred while restoring the site layout. Please try again later or contact the support services.
+siteManagement.label.restoreSitePages.success=Site Pages and Navigation Tree are restored successfully
+siteManagement.label.restoreSitePages.error=An error occurred while restoring the site pages and navigation. Please try again later or contact the support services.