diff --git a/layout-webapp/src/main/webapp/WEB-INF/conf/configuration.xml b/layout-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
index 3554f55bb..fe806a361 100644
--- a/layout-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
+++ b/layout-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -25,6 +25,5 @@
     xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd">
 
   <import>war:/conf/layout/dynamic-container-configuration.xml</import>
-  <import>war:/conf/layout/features-configuration.xml</import>
 
 </configuration>
diff --git a/layout-webapp/src/main/webapp/WEB-INF/conf/layout/dynamic-container-configuration.xml b/layout-webapp/src/main/webapp/WEB-INF/conf/layout/dynamic-container-configuration.xml
index ef18cd99d..a7f82ba15 100644
--- a/layout-webapp/src/main/webapp/WEB-INF/conf/layout/dynamic-container-configuration.xml
+++ b/layout-webapp/src/main/webapp/WEB-INF/conf/layout/dynamic-container-configuration.xml
@@ -46,10 +46,7 @@
             <field name="permissions">
               <collection type="java.util.ArrayList">
                 <value>
-                  <string>manager:/platform/administrators</string>
-                </value>
-                <value>
-                  <string>editor:/platform/web-contributors</string>
+                  <string>*:/platform/users</string>
                 </value>
               </collection>
             </field>
diff --git a/layout-webapp/src/main/webapp/WEB-INF/conf/layout/features-configuration.xml b/layout-webapp/src/main/webapp/WEB-INF/conf/layout/features-configuration.xml
deleted file mode 100644
index 74ebcb662..000000000
--- a/layout-webapp/src/main/webapp/WEB-INF/conf/layout/features-configuration.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  This file is part of the Meeds project (https://meeds.io/).
-
-  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
--->
-<configuration
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd http://www.exoplatform.org/xml/ns/kernel_1_3.xsd"
-  xmlns="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd">
-  <component>
-    <key>MeedsFeatureProperties</key>
-    <type>org.exoplatform.container.ExtendedPropertyConfigurator</type>
-    <init-params>
-      <properties-param>
-        <name>MeedsFeatureProperties</name>
-        <property name="exo.feature.LayoutAllAppsDrawer.enabled" value="${exo.feature.LayoutAllAppsDrawer.enabled:false}" />
-      </properties-param>
-    </init-params>
-  </component>
-  <component>
-    <key>LayoutEditorChangesAnnounced</key>
-    <type>org.exoplatform.container.ExtendedPropertyConfigurator</type>
-    <init-params>
-      <properties-param>
-        <name>LayoutEditorChangesAnnounced</name>
-        <property name="exo.feature.LayoutEditorChangesAnnounced.enabled" value="${exo.feature.LayoutEditorChangesAnnounced.enabled:false}" />
-      </properties-param>
-    </init-params>
-  </component>
-</configuration>
diff --git a/layout-webapp/src/main/webapp/WEB-INF/jsp/layoutEditor.jsp b/layout-webapp/src/main/webapp/WEB-INF/jsp/layoutEditor.jsp
index bf35b935a..b09334627 100644
--- a/layout-webapp/src/main/webapp/WEB-INF/jsp/layoutEditor.jsp
+++ b/layout-webapp/src/main/webapp/WEB-INF/jsp/layoutEditor.jsp
@@ -1,14 +1,14 @@
-<%@page import="org.exoplatform.commons.api.settings.ExoFeatureService"%>
+<%@page import="io.meeds.layout.service.LayoutAclService"%>
 <%@page import="org.exoplatform.container.ExoContainerContext"%>
 <%
-  ExoFeatureService featureService = ExoContainerContext.getService(ExoFeatureService.class);
-  boolean layoutAllAppsDrawerActive = featureService.isFeatureActiveForUser("LayoutAllAppsDrawer", request.getRemoteUser());
+  LayoutAclService aclService = ExoContainerContext.getService(LayoutAclService.class);
+  boolean isAdministrator = aclService.isAdministrator(request.getRemoteUser());
 %>
 <div class="VuetifyApp">
   <div id="layoutEditor">
     <script type="text/javascript">
       require(['PORTLET/layout/LayoutEditor'], app => app.init());
-      eXo.env.portal.layoutAllAppsDrawer = <%=layoutAllAppsDrawerActive%>;
+      eXo.env.portal.isAdministrator = <%=isAdministrator%>;
     </script>
   </div>
 </div>
diff --git a/layout-webapp/src/main/webapp/WEB-INF/jsp/siteNavigation.jsp b/layout-webapp/src/main/webapp/WEB-INF/jsp/siteNavigation.jsp
index baa73879f..378cad061 100644
--- a/layout-webapp/src/main/webapp/WEB-INF/jsp/siteNavigation.jsp
+++ b/layout-webapp/src/main/webapp/WEB-INF/jsp/siteNavigation.jsp
@@ -19,6 +19,7 @@
     <script type="text/javascript">
       eXo.env.portal.siteKeyName = '<%=siteName%>';
       eXo.env.portal.isAdministrator = <%=isAdministrator%>;
+      eXo.env.portal.canManageSiteNavigation = <%=canManageSiteNavigation%>;
       require(['PORTLET/layout/SiteNavigation'], app => app.init(<%=canManageSiteNavigation%>));
     </script>
   </div>
diff --git a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/toolbar/Toolbar.vue b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/toolbar/Toolbar.vue
index 10fab0a5a..0e85a1ad3 100644
--- a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/toolbar/Toolbar.vue
+++ b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/toolbar/Toolbar.vue
@@ -31,7 +31,7 @@
     <v-spacer />
     <layout-editor-toolbar-history-buttons class="me-3" />
     <layout-editor-toolbar-save-as-template-button
-      v-if="!pageTemplateId"
+      v-if="!pageTemplateId && isAdministrator"
       class="me-3" />
     <layout-editor-toolbar-preview-button
       class="me-3" />
@@ -64,6 +64,9 @@ export default {
     },
   },
   computed: {
+    isAdministrator() {
+      return eXo.env.portal.isAdministrator;
+    },
     defaultLanguage() {
       return eXo.env.portal.defaultLanguage;
     },