diff --git a/modules/admin-gui/resources/WEB-INF/include/template.xhtml b/modules/admin-gui/resources/WEB-INF/include/template.xhtml
index 99b759de8d9..8524e4ca3b5 100644
--- a/modules/admin-gui/resources/WEB-INF/include/template.xhtml
+++ b/modules/admin-gui/resources/WEB-INF/include/template.xhtml
@@ -65,52 +65,49 @@
       
     </ui:insert>
     
-     <p:menubar id="mainNavigation" autoDisplay="false">
-    	<p:menuitem url="#{adminMenuBean.adminWebUrl}" value="#{web.text.NAV_HOME}" icon="pi pi-fw pi-home"/>  
-    
+    <p:menubar id="mainNavigation" autoDisplay="false">
+        <p:menuitem id="mainHome" url="#{adminMenuBean.adminWebUrl}" value="#{web.text.NAV_HOME}" icon="pi pi-fw pi-home"/>
         <p:submenu id="mainCaFunctions" label="#{web.text.NAV_CAFUNCTIONS}" icon="pi pi-fw pi-server" rendered="#{adminMenuBean.authorizedToViewCAHeader}">
-           	<p:menuitem id="caCaactivation" value="#{web.text.NAV_CAACTIVATION}" rendered="#{adminMenuBean.authorizedToViewCAActivation}" url="#{adminMenuBean.adminWebUrl}ca/caactivation.xhtml"/>			
+            <p:menuitem id="caCaactivation" value="#{web.text.NAV_CAACTIVATION}" rendered="#{adminMenuBean.authorizedToViewCAActivation}" url="#{adminMenuBean.adminWebUrl}ca/caactivation.xhtml"/>
             <p:menuitem id="caCafunctions" value="#{web.text.NAV_CASTRUCTUREANDCRL}" rendered="#{adminMenuBean.authorizedToViewCA}" url="#{adminMenuBean.adminWebUrl}ca/cafunctions.xhtml"/>
             <p:menuitem id="caEditcertificateprofiles" value="#{web.text.NAV_CERTIFICATEPROFILES}" rendered="#{adminMenuBean.authorizedToViewCertificateProfile}" url="#{adminMenuBean.adminWebUrl}ca/editcertificateprofiles/editcertificateprofiles.xhtml"/>
+            <p:menuitem id="caCryptotokens" value="#{web.text.NAV_CRYPTOTOKENS}" url="#{adminMenuBean.adminWebUrl}cryptotoken/cryptotokens.xhtml" rendered="#{adminMenuBean.authorizedToViewCryptotoken}"/>
             <p:menuitem id="caEditcas" value="#{web.text.NAV_CAS}" url="#{adminMenuBean.adminWebUrl}ca/editcas/managecas.xhtml"  rendered="#{adminMenuBean.authorizedToViewCA}"/>
-        	<p:menuitem id="caCryptotokens" value="#{web.text.NAV_CRYPTOTOKENS}" url="#{adminMenuBean.adminWebUrl}cryptotoken/cryptotokens.xhtml" rendered="#{adminMenuBean.authorizedToViewCryptotoken}"/>
             <p:menuitem id="caEditpublishers" value="#{web.text.NAV_PUBLISHERS}" url="#{adminMenuBean.adminWebUrl}ca/editpublishers/listpublishers.xhtml" rendered="#{adminMenuBean.authorizedToViewPublishers}"/>
-        	<p:menuitem id="caEditvalidators" value="#{web.text.NAV_VALIDATORS}" url="#{adminMenuBean.adminWebUrl}ca/editvalidators/editvalidators.xhtml" rendered="#{adminMenuBean.authorizedToViewValidators}"/>
+            <p:menuitem id="caEditvalidators" value="#{web.text.NAV_VALIDATORS}" url="#{adminMenuBean.adminWebUrl}ca/editvalidators/editvalidators.xhtml" rendered="#{adminMenuBean.authorizedToViewValidators}"/>
+        </p:submenu>
+        <p:submenu id="mainRaFunctions" label="#{web.text.NAV_RAFUNCTIONS}" icon="pi pi-fw pi-users" rendered="#{adminMenuBean.authorizedToViewRAHeader}">
+            <p:menuitem id="raAddendentity" url="#{adminMenuBean.adminWebUrl}ra/addendentity.xhtml" rendered="#{adminMenuBean.authorizedToCreateEndEntity}" value="#{web.text.NAV_ADDENDENTITY}"/>
+       	    <p:menuitem id="raEditendentityprofiles" url="#{adminMenuBean.adminWebUrl}ra/editendentityprofiles/editendentityprofiles.xhtml" rendered="#{adminMenuBean.authorizedToViewEndEntityProfiles}" value="#{web.text.NAV_ENDENTITYPROFILES}"/>
+       	    <p:menuitem id="raListendentities" url="#{adminMenuBean.adminWebUrl}ra/searchendentities.xhtml" rendered="#{adminMenuBean.authorizedToViewEndEntity}" value="#{web.text.NAV_SEARCHENDENTITIES}"/>
+        </p:submenu>
+        <p:submenu id="mainVaFunctions" label="#{web.text.NAV_VAFUNCTIONS}" icon="pi pi-fw pi-check-circle" rendered="#{adminMenuBean.authorizedToViewVAHeader}">
+            <p:menuitem id="vaOcspResponders" url="#{adminMenuBean.adminWebUrl}keybind/ocspresponders.xhtml" rendered="#{adminMenuBean.authorizedViewInternalKeyBindings}" value="#{web.text.NAV_OCSPRESPONDERS}"/>
         </p:submenu>
-        <p:submenu id="mainRaFunctions" label="#{web.text.NAV_RAFUNCTIONS}" icon="pi pi-fw pi-users" rendered="#{adminMenuBean.authorizedToViewRAHeader}">	
-			<p:menuitem id="raAddendentity" url="#{adminMenuBean.adminWebUrl}ra/addendentity.xhtml" rendered="#{adminMenuBean.authorizedToCreateEndEntity}" value="#{web.text.NAV_ADDENDENTITY}"/>
-       		<p:menuitem id="raEditendentityprofiles" url="#{adminMenuBean.adminWebUrl}ra/editendentityprofiles/editendentityprofiles.xhtml" rendered="#{adminMenuBean.authorizedToViewEndEntityProfiles}" value="#{web.text.NAV_ENDENTITYPROFILES}"/>
-       		<p:menuitem id="raListendentities" url="#{adminMenuBean.adminWebUrl}ra/searchendentities.xhtml" rendered="#{adminMenuBean.authorizedToViewEndEntity}" value="#{web.text.NAV_SEARCHENDENTITIES}"/>
+        <p:submenu id="mainControls" label="#{web.text.NAV_CONTROLS}" icon="pi pi-fw pi-id-card" rendered="#{adminMenuBean.authorizedToViewControlsHeader}">
+            <p:menuitem id="ctrlRoles" url="#{adminMenuBean.adminWebUrl}administratorprivileges/roles.xhtml" rendered="#{adminMenuBean.authorizedToViewRoles}" value="#{web.text.NAV_ROLES}"/>
+            <p:menuitem id="ctrlEditapprovalprofiles" url="#{adminMenuBean.adminWebUrl}approval/editapprovalprofiles.xhtml" rendered="#{adminMenuBean.authorizedToViewApprovalProfiles}" value="#{web.text.NAV_APPROVALPROFILES}"/>
+            <p:menuitem id="ctrlApproveactions" url="#{adminMenuBean.adminWebUrl}approval/approvalactions.xhtml" rendered="#{adminMenuBean.authorizedToApproveActions}" value="#{web.text.NAV_APPROVEACTIONS}"/>
+            <p:menuitem id="ctrlAuditsearch" url="#{adminMenuBean.adminWebUrl}audit/search.xhtml" rendered="#{adminMenuBean.authorizedToViewLog}" value="#{web.text.NAV_AUDIT}"/>
         </p:submenu>
-        <p:submenu id="mainVaFunctions" label="#{web.text.NAV_VAFUNCTIONS}" icon="pi pi-fw pi-book" rendered="#{adminMenuBean.authorizedToViewVAHeader}">
-           	<p:menuitem id="vaOcspResonders" url="#{adminMenuBean.adminWebUrl}keybind/ocspresponders.xhtml" rendered="#{adminMenuBean.authorizedViewInternalKeyBindings}" value="#{web.text.NAV_OCSPRESPONDERS}"/>   	
+        <p:submenu id="mainProtocols" label="#{web.text.NAV_PROTOCOLS}" icon="pi pi-fw pi-arrow-right-arrow-left" rendered="#{adminMenuBean.authorizedToViewProtocolsHeader}">
+            <p:menuitem id="protocolAcme" url="#{adminMenuBean.adminWebUrl}sysconfig/acmeconfiguration.xhtml" rendered="#{adminMenuBean.authorizedToViewAcmeConfiguration}" value="#{web.text.NAV_ACMECONFIGURATION}"/>
+            <p:menuitem id="protocolAutoenroll" url="#{adminMenuBean.adminWebUrl}sysconfig/autoenrollconfiguration.xhtml" rendered="#{adminMenuBean.authorizedToViewAutoenrollConfiguration}" value="#{web.text.NAV_AUTOENROLLCONFIGURATION}"/>
+            <p:menuitem id="protocolCmp" url="#{adminMenuBean.adminWebUrl}sysconfig/cmpaliases.xhtml" rendered="#{adminMenuBean.authorizedToViewCmpConfiguration}" value="#{web.text.NAV_CMPCONFIGURATION}"/>
+            <p:menuitem id="protocolEst" url="#{adminMenuBean.adminWebUrl}sysconfig/estconfigurations.xhtml" rendered="#{adminMenuBean.authorizedToViewEstConfiguration}" value="#{web.text.NAV_ESTCONFIGURATION}"/>
+            <p:menuitem id="protocolScep" url="#{adminMenuBean.adminWebUrl}sysconfig/scepconfiguration.xhtml" rendered="#{adminMenuBean.authorizedToViewScepConfiguration}" value="#{web.text.NAV_SCEPCONFIGURATION}"/>
         </p:submenu>
-        <p:submenu id="mainSupervisionFunctions" label="#{web.text.NAV_SUPERVISIONFUNCTIONS}" icon="pi pi-fw pi-user-plus" rendered="#{adminMenuBean.authorizedToViewSupervisionFunctionsHeader}">
-			<p:menuitem id="supervisionEditapprovalprofiles" url="#{adminMenuBean.adminWebUrl}approval/editapprovalprofiles.xhtml" rendered="#{adminMenuBean.authorizedToViewApprovalProfiles}" value="#{web.text.NAV_APPROVALPROFILES}"/>
-        	<p:menuitem id="supervisionApproveactionlist" url="#{adminMenuBean.adminWebUrl}approval/approvalactions.xhtml" rendered="#{adminMenuBean.authorizedToApproveActions}" value="#{web.text.NAV_APPROVEACTIONS}"/>
-			<p:menuitem id="supervisionAuditsearch" url="#{adminMenuBean.adminWebUrl}audit/search.xhtml" rendered="#{adminMenuBean.authorizedToViewLog}" value="#{web.text.NAV_AUDIT}"/>
-		</p:submenu>
-		
-		<p:submenu id="mainSystemFunctions" label="#{web.text.NAV_SYSTEMFUNCTIONS}" icon="pi pi-fw pi-box" rendered="#{adminMenuBean.authorizedToViewSystemFunctionsHeader}">
-			<p:menuitem id="sysFuncsRoles" url="#{adminMenuBean.adminWebUrl}administratorprivileges/roles.xhtml" rendered="#{adminMenuBean.authorizedToViewRoles}" value="#{web.text.NAV_ROLES}"/>
-       		<p:menuitem id="sysFuncsKeyBindings" url="#{adminMenuBean.adminWebUrl}keybind/keybindings.xhtml" rendered="#{adminMenuBean.authorizedViewInternalKeyBindings}" value="#{web.text.NAV_KEYBINDINGS}"/>
-       		<p:menuitem id="sysFuncsPeerSystems" url="#{adminMenuBean.adminWebUrl}peerconnector/peerconnectors.xhtml" rendered="#{adminMenuBean.authorizedToViewPeerConnectors}" value="#{web.text.NAV_PEERCONNECTOR}"/>
-       		<p:menuitem id="sysFuncsServices" url="#{adminMenuBean.adminWebUrl}services/listservices.xhtml" rendered="#{adminMenuBean.authorizedToViewServices}" value="#{web.text.NAV_SERVICES}"/>
-		</p:submenu>
-        <p:submenu id="mainSystemConfiguration" label="#{web.text.NAV_SYSTEMCONFIGURATION}" icon="pi pi-fw pi-cog" rendered="#{adminMenuBean.authorizedToViewSystemConfigurationHeader}">
-           	<p:menuitem id="sysConfigAcme" url="#{adminMenuBean.adminWebUrl}sysconfig/acmeconfiguration.xhtml" rendered="#{adminMenuBean.authorizedToViewAcmeConfiguration}" value="#{web.text.NAV_ACMECONFIGURATION}"/>
-	   		<p:menuitem id="sysConfigAutoenroll" url="#{adminMenuBean.adminWebUrl}sysconfig/autoenrollconfiguration.xhtml" rendered="#{adminMenuBean.authorizedToViewAutoenrollConfiguration}" value="#{web.text.NAV_AUTOENROLLCONFIGURATION}"/> 
-	   		<p:menuitem id="sysConfigCmp" url="#{adminMenuBean.adminWebUrl}sysconfig/cmpaliases.xhtml" rendered="#{adminMenuBean.authorizedToViewCmpConfiguration}" value="#{web.text.NAV_CMPCONFIGURATION}"/>
-	   		<p:menuitem id="sysConfigEst" url="#{adminMenuBean.adminWebUrl}sysconfig/estconfigurations.xhtml" rendered="#{adminMenuBean.authorizedToViewEstConfiguration}" value="#{web.text.NAV_ESTCONFIGURATION}"/>
-	   		<p:menuitem id="sysConfigScep" url="#{adminMenuBean.adminWebUrl}sysconfig/scepconfiguration.xhtml" rendered="#{adminMenuBean.authorizedToViewScepConfiguration}" value="#{web.text.NAV_SCEPCONFIGURATION}"/>
-	   		<p:menuitem id="sysConfigGlobal" url="#{adminMenuBean.adminWebUrl}sysconfig/systemconfiguration.xhtml" rendered="#{adminMenuBean.authorizedToConfigureSystem}" value="#{web.text.NAV_SYSTEMCONFIGURATION}"/>
-	   		<p:menuitem id="sysConfigUpgrade" url="#{adminMenuBean.adminWebUrl}upgrade.xhtml" rendered="#{adminMenuBean.authorizedToConfigureSystem and adminMenuBean.upgradeRequired}" value="#{web.text.NAV_SYSTEMUPGRADE}"/>
-		    <p:menuitem url="#{adminMenuBean.adminWebUrl}mypreferences.xhtml" value="#{web.text.NAV_MYPREFERENCES}"/> 	
-      	</p:submenu>
-		<p:menuitem id="mainRaWeb" url="#{ejbcawebbean.getBaseUrl()}ra/" target="_ejbcaraweb" rel="noopener noreferer" rendered="#{adminMenuBean.authorizedToViewRaWeb}" value="#{web.text.RAWEB}"/>
-        <p:menuitem id="mainDocumentation" url="#{ejbcawebbean.getHelpBaseURI() }/index.html" target="_ejbcaDocWindow" rel="noopener noreferer" rendered="#{adminMenuBean.helpEnabled}" value="#{web.text.DOCUMENTATION}"/>
-        <p:menuitem id="mainLogout" url="#{ejbcawebbean.getBaseUrl()}adminweb/logout" target="_top" rendered="#{adminMenuBean.logoutAvailable}" value="#{web.text.LOGOUT}"/>
-              
+        <p:submenu id="mainConfiguration" label="#{web.text.NAV_CONFIGURATION}" icon="pi pi-fw pi-cog" rendered="#{adminMenuBean.authorizedToViewConfigurationHeader}">
+       	    <p:menuitem id="confKeyBindings" url="#{adminMenuBean.adminWebUrl}keybind/keybindings.xhtml" rendered="#{adminMenuBean.authorizedViewInternalKeyBindings}" value="#{web.text.NAV_KEYBINDINGS}"/>
+       	    <p:menuitem id="confPeerSystems" url="#{adminMenuBean.adminWebUrl}peerconnector/peerconnectors.xhtml" rendered="#{adminMenuBean.authorizedToViewPeerConnectors}" value="#{web.text.NAV_PEERCONNECTOR}"/>
+       	    <p:menuitem id="confServices" url="#{adminMenuBean.adminWebUrl}services/listservices.xhtml" rendered="#{adminMenuBean.authorizedToViewServices}" value="#{web.text.NAV_SERVICES}"/>
+            <p:menuitem id="confGlobal" url="#{adminMenuBean.adminWebUrl}sysconfig/systemconfiguration.xhtml" rendered="#{adminMenuBean.authorizedToConfigureSystem}" value="#{web.text.NAV_SYSTEMCONFIGURATION}"/>
+            <p:menuitem id="confUpgrade" url="#{adminMenuBean.adminWebUrl}upgrade.xhtml" rendered="#{adminMenuBean.authorizedToConfigureSystem and adminMenuBean.upgradeRequired}" value="#{web.text.NAV_SYSTEMUPGRADE}"/>
+            <p:menuitem id="confMypreferences" url="#{adminMenuBean.adminWebUrl}mypreferences.xhtml" value="#{web.text.NAV_MYPREFERENCES}"/>
+       </p:submenu>
+        <p:menuitem id="mainRaWeb" url="#{ejbcawebbean.getBaseUrl()}ra/" target="_ejbcaraweb" rel="noopener noreferer" rendered="#{adminMenuBean.authorizedToViewRaWeb}" value="#{web.text.RAWEB}" icon="pi pi-fw pi-globe"/>
+        <p:menuitem id="mainDocumentation" url="#{ejbcawebbean.getHelpBaseURI() }/index.html" target="_ejbcaDocWindow" rel="noopener noreferer" rendered="#{adminMenuBean.helpEnabled}" value="#{web.text.DOCUMENTATION}" icon="pi pi-fw pi-question-circle"/>
+        <p:menuitem id="mainLogout" url="#{ejbcawebbean.getBaseUrl()}adminweb/logout" target="_top" rendered="#{adminMenuBean.logoutAvailable}" value="#{web.text.LOGOUT}" icon="pi pi-fw pi-sign-out"/>
     </p:menubar>
         
     <h:panelGroup layout="block" styleClass="main-wrapper">
diff --git a/modules/admin-gui/resources/languages/languagefile.bs.properties b/modules/admin-gui/resources/languages/languagefile.bs.properties
index a50c772a85e..1f0b9404aa3 100644
--- a/modules/admin-gui/resources/languages/languagefile.bs.properties
+++ b/modules/admin-gui/resources/languages/languagefile.bs.properties
@@ -294,9 +294,7 @@ NAV_ADDENDENTITY          = Dodaj krajnji entitet
 
 NAV_SEARCHENDENTITIES     = Pretraži krajnje entitete
 
-
-
-NAV_SUPERVISIONFUNCTIONS  = Supervizor funkcije
+NAV_CONTROLS              = Controls
 
 NAV_APPROVEACTIONS        = Dozvoljene radnje
 
@@ -304,7 +302,9 @@ NAV_VIEWLOG               = Pregledati log
 
 NAV_LOGCONFIGURATION      = Konfiguracija loga
 
-NAV_SYSTEMFUNCTIONS       = Sistemske funkcije
+NAV_PROTOCOLS             = Protocols
+
+NAV_CONFIGURATION         = Configuration
 
 NAV_SYSTEMCONFIGURATION   = Sistemnska konfiguracija
 
diff --git a/modules/admin-gui/resources/languages/languagefile.cs.properties b/modules/admin-gui/resources/languages/languagefile.cs.properties
index 0f3e06910bb..f42f8c446a5 100644
--- a/modules/admin-gui/resources/languages/languagefile.cs.properties
+++ b/modules/admin-gui/resources/languages/languagefile.cs.properties
@@ -345,9 +345,7 @@ NAV_ADDENDENTITY          = Přidat koncovou entitu
 
 NAV_SEARCHENDENTITIES     = Hledat koncové entity
 
-
-
-NAV_SUPERVISIONFUNCTIONS  = Kontrolní funkce
+NAV_CONTROLS              = Controls
 
 NAV_APPROVEACTIONS        = Schválit akce
 
@@ -357,7 +355,9 @@ NAV_CMPCONFIGURATION      = Konfigurace CMP
 
 NAV_SCEPCONFIGURATION	  = Konfigurace SCEP
 
-NAV_SYSTEMFUNCTIONS       = Systémové funkce
+NAV_PROTOCOLS             = Protocols
+
+NAV_CONFIGURATION         = Configuration
 
 NAV_SYSTEMCONFIGURATION   = Konfigurace systému
 
diff --git a/modules/admin-gui/resources/languages/languagefile.de.properties b/modules/admin-gui/resources/languages/languagefile.de.properties
index 0a67a7a3810..dffc122c3e1 100644
--- a/modules/admin-gui/resources/languages/languagefile.de.properties
+++ b/modules/admin-gui/resources/languages/languagefile.de.properties
@@ -366,7 +366,7 @@ NAV_ADDENDENTITY          = Identität hinzufügen
 
 NAV_SEARCHENDENTITIES     = Identitäten anzeigen und bearbeiten
 
-NAV_SUPERVISIONFUNCTIONS  = Überwachungsfunktionen
+NAV_CONTROLS              = Kontrolliert
 
 NAV_APPROVEACTIONS        = Prüfungsaktionen
 
@@ -384,7 +384,9 @@ NAV_SCEPCONFIGURATION     = SCEP Konfiguration
 
 NAV_ESTCONFIGURATION      = EST Konfiguration
 
-NAV_SYSTEMFUNCTIONS       = Systemfunktionen
+NAV_PROTOCOLS             = Protokolle
+
+NAV_CONFIGURATION         = Konfiguration
 
 NAV_SYSTEMCONFIGURATION   = Systemkonfiguration
 
diff --git a/modules/admin-gui/resources/languages/languagefile.en.properties b/modules/admin-gui/resources/languages/languagefile.en.properties
index 914ea49a0f3..e3ce3a83515 100644
--- a/modules/admin-gui/resources/languages/languagefile.en.properties
+++ b/modules/admin-gui/resources/languages/languagefile.en.properties
@@ -462,7 +462,7 @@ NAV_ADDENDENTITY          = Add End Entity
 
 NAV_SEARCHENDENTITIES     = Search End Entities
 
-NAV_SUPERVISIONFUNCTIONS  = Supervision Functions
+NAV_CONTROLS              = Controls
 
 NAV_APPROVEACTIONS        = Approve Actions
 
@@ -480,7 +480,9 @@ NAV_SCEPCONFIGURATION     = SCEP Configuration
 
 NAV_ESTCONFIGURATION      = EST Configuration
 
-NAV_SYSTEMFUNCTIONS       = System Functions
+NAV_PROTOCOLS             = Protocols
+
+NAV_CONFIGURATION         = Configuration
 
 NAV_SYSTEMCONFIGURATION   = System Configuration
 
diff --git a/modules/admin-gui/resources/languages/languagefile.es.properties b/modules/admin-gui/resources/languages/languagefile.es.properties
index db2ac909e15..389e396aaf5 100644
--- a/modules/admin-gui/resources/languages/languagefile.es.properties
+++ b/modules/admin-gui/resources/languages/languagefile.es.properties
@@ -192,13 +192,13 @@ NAV_ADDENDENTITY          = Agregar Entidad Final
 
 NAV_SEARCHENDENTITIES     = Listar Entidades Finales
 
-
-
 NAV_AUDIT               = Ver Log
 
 NAV_LOGCONFIGURATION      = Configuración de Log
 
-NAV_SYSTEMFUNCTIONS       = Funciones del Sistema
+NAV_PROTOCOLS             = Protocolos
+
+NAV_CONFIGURATION         = Configuración
 
 NAV_SYSTEMCONFIGURATION   = Configuración del Sistema
 
diff --git a/modules/admin-gui/resources/languages/languagefile.fr.properties b/modules/admin-gui/resources/languages/languagefile.fr.properties
index ba3d4671212..a7ae7895fd0 100644
--- a/modules/admin-gui/resources/languages/languagefile.fr.properties
+++ b/modules/admin-gui/resources/languages/languagefile.fr.properties
@@ -464,7 +464,7 @@ NAV_ADDENDENTITY          = Ajouter une entité
 
 NAV_SEARCHENDENTITIES     = Chercher des entités
 
-NAV_SUPERVISIONFUNCTIONS  = Supervision
+NAV_CONTROLS              = Contrôles
 
 NAV_APPROVEACTIONS        = Approuver les actions
 
@@ -482,7 +482,9 @@ NAV_SCEPCONFIGURATION     = Configuration SCEP
 
 NAV_ESTCONFIGURATION      = Configuration EST
 
-NAV_SYSTEMFUNCTIONS       = Fonctions système
+NAV_PROTOCOLS             = Protocoles
+
+NAV_CONFIGURATION         = Configuration
 
 NAV_SYSTEMCONFIGURATION   = Configuration système
 
diff --git a/modules/admin-gui/resources/languages/languagefile.it.properties b/modules/admin-gui/resources/languages/languagefile.it.properties
index 4ae81b9ad69..dcd38b959f1 100644
--- a/modules/admin-gui/resources/languages/languagefile.it.properties
+++ b/modules/admin-gui/resources/languages/languagefile.it.properties
@@ -118,7 +118,8 @@ NAV_ENDENTITYPROFILES     = Modifica profili di titolare
 NAV_ADDENDENTITY          = Aggiungi titolare
 NAV_SEARCHENDENTITIES     = Elenca/modifica titolari
 NAV_AUDIT               = Mostra registro
-NAV_SYSTEMFUNCTIONS       = Opzioni sistema
+NAV_PROTOCOLS             = Protocolli
+NAV_CONFIGURATION         = Configurazione
 NAV_SYSTEMCONFIGURATION   = Configurazione
 NAV_ROLES   = Diritti amministratore
 NAV_MYPREFERENCES         = Mie preferenze
diff --git a/modules/admin-gui/resources/languages/languagefile.ja.properties b/modules/admin-gui/resources/languages/languagefile.ja.properties
index dc5fead36f4..86a47a3cdc2 100644
--- a/modules/admin-gui/resources/languages/languagefile.ja.properties
+++ b/modules/admin-gui/resources/languages/languagefile.ja.properties
@@ -340,9 +340,7 @@ NAV_ADDENDENTITY          = \u30A8\u30F3\u30C9\u30A8\u30F3\u30C6\u30A3\u30C6\u30
 
 NAV_SEARCHENDENTITIES     = \u30A8\u30F3\u30C9\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u691C\u7D22/\u7DE8\u96C6
 
-
-
-NAV_SUPERVISIONFUNCTIONS  = \u7BA1\u7406\u6A5F\u80FD
+NAV_CONTROLS              = Controls
 
 NAV_APPROVEACTIONS        = \u30A2\u30AF\u30B7\u30E7\u30F3\u306E\u627F\u8A8D
 
@@ -352,7 +350,9 @@ NAV_CMPCONFIGURATION      = CMP\u30A8\u30A4\u30EA\u30A2\u30B9\u306E\u7BA1\u7406
 
 NAV_SCEPCONFIGURATION	  = SCEP\u30A8\u30A4\u30EA\u30A2\u30B9\u306E\u7BA1\u7406
 
-NAV_SYSTEMFUNCTIONS       = \u30B7\u30B9\u30C6\u30E0\u6A5F\u80FD
+NAV_PROTOCOLS             = Protocols
+
+NAV_CONFIGURATION         = Configuration
 
 NAV_SYSTEMCONFIGURATION   = \u30B7\u30B9\u30C6\u30E0\u8A2D\u5B9A
 
diff --git a/modules/admin-gui/resources/languages/languagefile.pt.properties b/modules/admin-gui/resources/languages/languagefile.pt.properties
index a48a2de0464..fa97a02965c 100644
--- a/modules/admin-gui/resources/languages/languagefile.pt.properties
+++ b/modules/admin-gui/resources/languages/languagefile.pt.properties
@@ -252,9 +252,7 @@ NAV_ADDENDENTITY          = Adicionar Titular
 
 NAV_SEARCHENDENTITIES     = Pesquisar Titulares
 
-
-
-NAV_SUPERVISIONFUNCTIONS  = Funções de Supervisão
+NAV_CONTROLS              = Controlos
 
 NAV_APPROVEACTIONS        = Aprovar Acções
 
@@ -262,7 +260,9 @@ NAV_AUDIT               = Ver Logs
 
 NAV_LOGCONFIGURATION      = Configuração de Logs
 
-NAV_SYSTEMFUNCTIONS       = Funções do Sistema
+NAV_PROTOCOLS             = Protocolos
+
+NAV_CONFIGURATION         = Configuração
 
 NAV_SYSTEMCONFIGURATION   = Configuração do Sistema
 
diff --git a/modules/admin-gui/resources/languages/languagefile.sv.properties b/modules/admin-gui/resources/languages/languagefile.sv.properties
index 577168ab4fc..8396ddd0811 100644
--- a/modules/admin-gui/resources/languages/languagefile.sv.properties
+++ b/modules/admin-gui/resources/languages/languagefile.sv.properties
@@ -226,9 +226,7 @@ NAV_ADDENDENTITY          = Lägg till slutanvändare
 
 NAV_SEARCHENDENTITIES     = Lista slutanvändare
 
-
-
-NAV_SUPERVISIONFUNCTIONS  = Övervakningsfunktioner
+NAV_CONTROLS              = Kontroller
 
 NAV_APPROVEACTIONS        = Godkänn begäran
 
@@ -236,7 +234,9 @@ NAV_AUDIT                 = Visa logg
 
 NAV_LOGCONFIGURATION      = Logginställningar
 
-NAV_SYSTEMFUNCTIONS       = Systemfunktioner
+NAV_PROTOCOLS             = Protokoll
+
+NAV_CONFIGURATION         = Konfiguration
 
 NAV_SYSTEMCONFIGURATION   = Systemkonfiguration
 
diff --git a/modules/admin-gui/resources/languages/languagefile.uk.properties b/modules/admin-gui/resources/languages/languagefile.uk.properties
index 5c733fae071..20c428f57a6 100644
--- a/modules/admin-gui/resources/languages/languagefile.uk.properties
+++ b/modules/admin-gui/resources/languages/languagefile.uk.properties
@@ -279,15 +279,15 @@ NAV_ADDENDENTITY          = Add End Entity
 
 NAV_SEARCHENDENTITIES     = \u041F\u043E\u0448\u0443\u043A/\u0417\u043C\u0456\u043D\u0430 \u043A\u0456\u043D\u0446\u0435\u0432\u0438\u0445 \u043E\u0431'\u0454\u043A\u0442\u0456\u0432
 
-
-
-NAV_SUPERVISIONFUNCTIONS      = \u0424\u0443\u043D\u043A\u0446\u0456\u0457 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u044E
+NAV_CONTROLS              = Controls
 
 NAV_APPROVEACTIONS        = Approve Actions
 
 NAV_AUDIT               = View Log
 
-NAV_SYSTEMFUNCTIONS           = \u0424\u0443\u043D\u043A\u0446\u0456\u0457 \u0421\u0438\u0441\u0442\u0435\u043C\u0438
+NAV_PROTOCOLS             = Protocols
+
+NAV_CONFIGURATION         = Configuration
 
 NAV_SYSTEMCONFIGURATION       = \u041A\u043E\u043D\u0444\u0456\u0433\u0443\u0440\u0430\u0446\u0456\u044F \u0421\u0438\u0441\u0442\u0435\u043C\u0438
 
diff --git a/modules/admin-gui/resources/languages/languagefile.vi.properties b/modules/admin-gui/resources/languages/languagefile.vi.properties
index 59a5c6b9452..acaa5ad3089 100644
--- a/modules/admin-gui/resources/languages/languagefile.vi.properties
+++ b/modules/admin-gui/resources/languages/languagefile.vi.properties
@@ -386,9 +386,7 @@ NAV_ADDENDENTITY          = Thêm thực thể cuối
 
 NAV_SEARCHENDENTITIES     = Tìm kiếm thực thể cuối
 
-
-
-NAV_SUPERVISIONFUNCTIONS  = Các chức năng giám sát
+NAV_CONTROLS              = Controls
 
 NAV_APPROVEACTIONS        = Thao tác chấp nhận
 
@@ -400,7 +398,9 @@ NAV_CMPCONFIGURATION      = Sự cấu hình CMP
 
 NAV_SCEPCONFIGURATION	  = Sự cấu hình SCEP
 
-NAV_SYSTEMFUNCTIONS       = Các chức năng hệ thống
+NAV_PROTOCOLS             = Protocols
+
+NAV_CONFIGURATION         = Configuration
 
 NAV_SYSTEMCONFIGURATION   = Sự cấu hình hệ thống
 
diff --git a/modules/admin-gui/resources/languages/languagefile.zh.properties b/modules/admin-gui/resources/languages/languagefile.zh.properties
index 50406c68ac2..4773ccf7674 100644
--- a/modules/admin-gui/resources/languages/languagefile.zh.properties
+++ b/modules/admin-gui/resources/languages/languagefile.zh.properties
@@ -204,9 +204,7 @@ NAV_ADDENDENTITY          = \u6dfb\u52a0\u7ec8\u7aef\u5b9e\u4f53
 
 NAV_SEARCHENDENTITIES     = \u5217\u51fa/\u7f16\u8f91\u7ec8\u7aef\u5b9e\u4f53
 
-
-
-NAV_SUPERVISIONFUNCTIONS  = \u76d1\u5bdf\u5458\u529f\u80fd
+NAV_CONTROLS              = Controls
 
 NAV_APPROVEACTIONS        = \u6279\u51c6\u64cd\u4f5c
 
@@ -214,7 +212,9 @@ NAV_AUDIT               = \u67e5\u770b\u65e5\u5fd7
 
 NAV_LOGCONFIGURATION      = \u65e5\u5fd7\u914d\u7f6e
 
-NAV_SYSTEMFUNCTIONS       = \u7cfb\u7edf\u529f\u80fd
+NAV_PROTOCOLS             = Protocols
+
+NAV_CONFIGURATION         = Configuration
 
 NAV_SYSTEMCONFIGURATION   = \u7cfb\u7edf\u914d\u7f6e
 
diff --git a/modules/admin-gui/resources/themes/default_theme.css b/modules/admin-gui/resources/themes/default_theme.css
index 72df31a1808..54b9c1fe93d 100644
--- a/modules/admin-gui/resources/themes/default_theme.css
+++ b/modules/admin-gui/resources/themes/default_theme.css
@@ -103,7 +103,15 @@ p.help, .helpNormal {
 }
 
 /*--------------------------------------------------------------------------*/
-/* NAVIGATION */
+/* NAVIGATION - Horizontal top */
+
+/* Wider submenu dropdown boxes */
+.ui-menu .ui-menu-parent .ui-menu-child {
+	width: 15em;
+}
+
+/*--------------------------------------------------------------------------*/
+/* NAVIGATION - Vertical left - OLD */
 
 body#menu {
 	margin: 0em;
diff --git a/modules/admin-gui/resources/themes/second_theme.css b/modules/admin-gui/resources/themes/second_theme.css
index 9255d1b1680..8a2b2a7a194 100644
--- a/modules/admin-gui/resources/themes/second_theme.css
+++ b/modules/admin-gui/resources/themes/second_theme.css
@@ -103,7 +103,15 @@ p.help, .helpNormal {
 }
 
 /*--------------------------------------------------------------------------*/
-/* NAVIGATION */
+/* NAVIGATION - Horizontal top */
+
+/* Wider submenu dropdown boxes */
+.ui-menu .ui-menu-parent .ui-menu-child {
+	width: 15em;
+}
+
+/*--------------------------------------------------------------------------*/
+/* NAVIGATION - Vertical left - OLD */
 
 body#menu {
 	margin: 0em;
diff --git a/modules/admin-gui/src/org/ejbca/ui/web/admin/AdminMenuBean.java b/modules/admin-gui/src/org/ejbca/ui/web/admin/AdminMenuBean.java
index f734fb4204c..6516377ce99 100644
--- a/modules/admin-gui/src/org/ejbca/ui/web/admin/AdminMenuBean.java
+++ b/modules/admin-gui/src/org/ejbca/ui/web/admin/AdminMenuBean.java
@@ -56,6 +56,7 @@ private GlobalConfiguration getGlobalConfiguration() {
     }
 
     /*===CA FUNCTIONS===*/
+    
     public boolean isAuthorizedToViewCA() {
         return authorizationSession.isAuthorizedNoLogging(getAdmin(), StandardRules.CAVIEW.resource());
     }
@@ -91,7 +92,7 @@ public boolean isAuthorizedToViewCAHeader() {
                 || isAuthorizedToViewPublishers()
                 || isAuthorizedToViewValidators();
     }
-       
+
     /*===RA FUNCTIONS===*/
     
     public boolean isAuthorizedToCreateEndEntity() {
@@ -105,7 +106,6 @@ public boolean isAuthorizedToViewEndEntityProfiles() {
     public boolean isAuthorizedToViewEndEntity() {
         return authorizationSession.isAuthorizedNoLogging(getAdmin(), AccessRulesConstants.REGULAR_VIEWENDENTITY);
     }
- 
     
     public boolean isAuthorizedToViewRAHeader() {
         return getEjbcaErrorWebBean().isRunningBuildWithCA()
@@ -114,12 +114,18 @@ public boolean isAuthorizedToViewRAHeader() {
                 || isAuthorizedToViewEndEntity());
     }
 
+    /*===VA FUNCTIONS===*/
+    
     public boolean isAuthorizedToViewVAHeader() {
         return getEjbcaErrorWebBean().isRunningBuildWithVA()
                 && isAuthorizedViewInternalKeyBindings();
     }
 
-    /*===SUPERVISION FUNCTIONS===*/
+    /*===CONTROLS===*/
+    
+    public boolean isAuthorizedToViewRoles() {
+        return authorizationSession.isAuthorizedNoLogging(getAdmin(), StandardRules.VIEWROLES.resource());
+    }
     
     public boolean isAuthorizedToViewApprovalProfiles() {
         return getEjbcaErrorWebBean().isRunningBuildWithCA()
@@ -137,49 +143,15 @@ public boolean isAuthorizedToViewLog() {
                 !getEjbcaWebBean().getEjb().getSecurityEventsAuditorSession().getQuerySupportingLogDevices().isEmpty();
     }
     
-    public boolean isAuthorizedToViewSupervisionFunctionsHeader() {
-        return isAuthorizedToViewApprovalProfiles()
+    public boolean isAuthorizedToViewControlsHeader() {
+        return isAuthorizedToViewRoles()
+                || isAuthorizedToViewApprovalProfiles()
                 || isAuthorizedToApproveActions()
                 || isAuthorizedToViewLog();
     }
-    
-    /*===SYSTEM FUNCTIONS===*/
-    
-    public boolean isAuthorizedToViewRoles() {
-        return authorizationSession.isAuthorizedNoLogging(getAdmin(), StandardRules.VIEWROLES.resource());
-    }
-    
-    public boolean isAuthorizedViewInternalKeyBindings() {
-        return authorizationSession.isAuthorizedNoLogging(getAdmin(), InternalKeyBindingRules.VIEW.resource());
-    }
-    
-    public boolean isAuthorizedToViewPeerConnectors() {
-        return getEjbcaWebBean().isPeerConnectorPresent() && authorizationSession.isAuthorizedNoLogging(getAdmin(), AccessRulesConstants.REGULAR_PEERCONNECTOR_VIEW);
-    }
-    
-    public boolean isAuthorizedToViewServices() {
-        return authorizationSession.isAuthorizedNoLogging(getAdmin(), AccessRulesConstants.SERVICES_VIEW);
-    }
-    
-    public boolean isAuthorizedToViewSystemFunctionsHeader() {
-        return isAuthorizedToViewRoles()
-                || isAuthorizedViewInternalKeyBindings()
-                || isAuthorizedToViewPeerConnectors()
-                || isAuthorizedToViewServices();
-    }
-    
-    /*===SYSTEM CONFIGURATION===*/
-    
-    public boolean isAuthorizedToViewSystemConfiguration() {
-        return authorizationSession.isAuthorizedNoLogging(getAdmin(), StandardRules.SYSTEMCONFIGURATION_VIEW.resource());
-    }
-    
-    public boolean isAuthorizedToViewEstConfiguration() {
-        return getEjbcaWebBean().isRunningEnterprise() 
-                && getEjbcaErrorWebBean().isRunningBuildWithCA()
-                && isAuthorizedToViewSystemConfiguration();
-    }
 
+    /*===PROTOCOLS===*/
+    
     public boolean isAuthorizedToViewAcmeConfiguration() {
         return getEjbcaWebBean().isRunningEnterprise() 
                 && getEjbcaErrorWebBean().isRunningBuildWithCA()
@@ -197,11 +169,43 @@ public boolean isAuthorizedToViewCmpConfiguration() {
                 && authorizationSession.isAuthorizedNoLogging(getAdmin(), StandardRules.SYSTEMCONFIGURATION_VIEW.resource());
     }
     
+    public boolean isAuthorizedToViewEstConfiguration() {
+        return getEjbcaWebBean().isRunningEnterprise() 
+                && getEjbcaErrorWebBean().isRunningBuildWithCA()
+                && isAuthorizedToViewSystemConfiguration();
+    }
+    
     public boolean isAuthorizedToViewScepConfiguration() {
         return getEjbcaErrorWebBean().isRunningBuildWithCA()
                 && authorizationSession.isAuthorizedNoLogging(getAdmin(), StandardRules.SYSTEMCONFIGURATION_VIEW.resource());
     }
     
+    public boolean isAuthorizedToViewProtocolsHeader() {
+        return isAuthorizedToViewAcmeConfiguration()
+                || isAuthorizedToViewAutoenrollConfiguration()
+                || isAuthorizedToViewCmpConfiguration()
+                || isAuthorizedToViewEstConfiguration()
+                || isAuthorizedToViewScepConfiguration();
+    }
+
+    /*===CONFIGURATION===*/
+    
+    public boolean isAuthorizedToViewSystemConfiguration() {
+        return authorizationSession.isAuthorizedNoLogging(getAdmin(), StandardRules.SYSTEMCONFIGURATION_VIEW.resource());
+    }
+    
+    public boolean isAuthorizedViewInternalKeyBindings() {
+        return authorizationSession.isAuthorizedNoLogging(getAdmin(), InternalKeyBindingRules.VIEW.resource());
+    }
+    
+    public boolean isAuthorizedToViewPeerConnectors() {
+        return getEjbcaWebBean().isPeerConnectorPresent() && authorizationSession.isAuthorizedNoLogging(getAdmin(), AccessRulesConstants.REGULAR_PEERCONNECTOR_VIEW);
+    }
+    
+    public boolean isAuthorizedToViewServices() {
+        return authorizationSession.isAuthorizedNoLogging(getAdmin(), AccessRulesConstants.SERVICES_VIEW);
+    }
+    
     public boolean isAuthorizedToConfigureSystem() {
         return authorizationSession.isAuthorizedNoLogging(getAdmin(), StandardRules.SYSTEMCONFIGURATION_VIEW.resource()) 
                 || authorizationSession.isAuthorizedNoLogging(getAdmin(), StandardRules.EKUCONFIGURATION_VIEW.resource()) 
@@ -212,19 +216,21 @@ public boolean isUpgradeRequired() {
         return EjbcaJSFHelper.getBean().getEjbcaWebBean().isPostUpgradeRequired();
     }
     
-    public boolean isAuthorizedToViewSystemConfigurationHeader() {
+    public boolean isAuthorizedToEditPreferences() {
+        return authorizationSession.isAuthorizedNoLogging(getAdmin(), AccessRulesConstants.ROLE_ADMINISTRATOR);
+    }
+    
+    public boolean isAuthorizedToViewConfigurationHeader() {
         return isAuthorizedToViewSystemConfiguration()
-                || isAuthorizedToViewEstConfiguration()
+                || isAuthorizedViewInternalKeyBindings()
+                || isAuthorizedToViewPeerConnectors()
+                || isAuthorizedToViewServices()
                 || isAuthorizedToConfigureSystem()
                 || isUpgradeRequired();
     }
     
     /*===OTHER===*/
     
-    public boolean isAuthorizedToEditPreferences() {
-        return authorizationSession.isAuthorizedNoLogging(getAdmin(), AccessRulesConstants.ROLE_ADMINISTRATOR);
-    }
-    
     public boolean isAuthorizedToViewRaWeb() {
         return getEjbcaErrorWebBean().isRunningBuildWithRAWeb();
     }