Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r1bc34c23575fe101b85c851cff245436394d7123 -r6c65a4129d2459bf2910b76b20263a6a00bdf8fb
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 1bc34c23575fe101b85c851cff245436394d7123)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 6c65a4129d2459bf2910b76b20263a6a00bdf8fb)
@@ -70,53 +70,59 @@
     readonly property bool visibleDeviceConfiguration   :   onlyManufacturing   &&  loggedIn
     readonly property bool visibleDeviceRegistration    :   onlyManufacturing   &&  loggedIn
     readonly property bool visibleInstitutionalRecord   :   true
+    readonly property bool visibleFeatureConfigurations :                           loggedIn
+    readonly property bool visibleAdvancedInstitutional :                           loggedIn
     readonly property bool visibleLocalization          :                           loggedIn
-    readonly property bool visibleUserModes             :                           loggedIn
+    readonly property bool visibleAdvancedModes         :                           loggedIn
 
     readonly property string settingsTitle              : _GuiView.manufactSetup ? qsTr("Manufacturing Setup")  : _GuiView.updateSetup
                                                                                  ? qsTr("Software Update")      : qsTr("Device Settings")
 
     enum ItemsIndex {
-        Information         ,
-        VolumeBrightness    ,
-        WiFi                ,
-        DGCleaning          ,
-        DGScheduling        ,
-        ServicePassword     ,
-        SetDateTime         ,
-        ExportLogs          ,
-        Localization        ,
-        RoInput             ,
-        Calibration         ,
-        DeviceConfiguration ,
-        DeviceRegistration  ,
-        SWUpdate            ,
-        RootSSHAccess       ,
-        FactoryReset        ,
-        Decommission        ,
-        InstitutionalRecord ,
-        UserMode
+        Information             ,
+        VolumeBrightness        ,
+        WiFi                    ,
+        DGCleaning              ,
+        DGScheduling            ,
+        ServicePassword         ,
+        SetDateTime             ,
+        ExportLogs              ,
+        Localization            ,
+        RoInput                 ,
+        Calibration             ,
+        DeviceConfiguration     ,
+        DeviceRegistration      ,
+        SWUpdate                ,
+        RootSSHAccess           ,
+        FactoryReset            ,
+        Decommission            ,
+        InstitutionalRecord     ,
+        AdvancedInstitutional   ,
+        FeatureConfigurations   ,
+        AdvancedMode
     }
     property var itemsText  : [
-        qsTr("Device Information"           ), // Device Information
-        qsTr("Volume And Brightness"        ), // VolumeBrightness
-        qsTr("Wi-Fi"                        ), // WiFi
-        qsTr("Device Cleaning"              ), // DGCleaning
-        qsTr("DG Scheduling"                ), // DGScheduling
-        qsTr("Service"                      ), // servicePassword
-        qsTr("Date and Time"                ), // SetDateTime
-        qsTr("Export Logs"                  ), // ExportLogs
-        qsTr("Language"                     ), // Localization
-        qsTr("Water Input Mode"             ), // RoInput
-        qsTr("Calibration"                  ), // Calibration
-        qsTr("Device Configuration"         ), // Device Configuration
-        qsTr("Device Registration"          ), // DeviceRegistration
-        qsTr("Software Update"              ), // SWUpdate
-        qsTr("Enable Root SSH"              ), // RootSSHAccess
-        qsTr("Factory Reset"                ), // FactoryReset
-        qsTr("Decommissioning"              ), // Decommission
-        qsTr("Institutional Configurations" ), // Institutional Configurations
-        qsTr("User Modes"                   ), // User Modes
+        qsTr("Device Information"               ), // Device Information
+        qsTr("Volume And Brightness"            ), // VolumeBrightness
+        qsTr("Wi-Fi"                            ), // WiFi
+        qsTr("Device Cleaning"                  ), // DGCleaning
+        qsTr("DG Scheduling"                    ), // DGScheduling
+        qsTr("Service"                          ), // servicePassword
+        qsTr("Date and Time"                    ), // SetDateTime
+        qsTr("Export Logs"                      ), // ExportLogs
+        qsTr("Language"                         ), // Localization
+        qsTr("Water Input Mode"                 ), // RoInput
+        qsTr("Calibration"                      ), // Calibration
+        qsTr("Device Configuration"             ), // Device Configuration
+        qsTr("Device Registration"              ), // DeviceRegistration
+        qsTr("Software Update"                  ), // SWUpdate
+        qsTr("Enable Root SSH"                  ), // RootSSHAccess
+        qsTr("Factory Reset"                    ), // FactoryReset
+        qsTr("Decommissioning"                  ), // Decommission
+        qsTr("Institutional Configurations"     ), // Institutional Configurations
+        qsTr("Advanced Institutional Settings"  ), // AdvancedInstitutional
+        qsTr("Feature Configurations"           ), // FeatureConfigurations
+        qsTr("Advanced Mode"                    ), // Advanced Modes
     ]
 
     property var itemsVisible  : [
@@ -138,7 +144,9 @@
         visibleFactoryReset                 , // FactoryReset
         visibleDecommission                 , // Decommission
         visibleInstitutionalRecord          , // Institutional Record
-        visibleUserModes                    , //  User Modes
+        visibleAdvancedInstitutional        , // AdvancedInstitutional
+        visibleFeatureConfigurations        , // FeatureConfigurations
+        visibleAdvancedModes                , // Advanced Modes
     ]
 
     // TODO: SRS 405/406 Test Mode instead add Q_PROPERTY to monitor state???
@@ -232,16 +240,25 @@
                 break
 
             case SettingsStack.InstitutionalRecord:
-                vAdjustmentInstitutionalRecord.doAdjustment()
+                vInstitutionalRecord.doAdjustment()
                 push( _settingsInstitutionalRecord )
                 break
 
+            case SettingsStack.AdvancedInstitutional:
+                vAdvancedInstitutionalRecord.doAdjustment()
+                push( _settingsAdvancedInstitutional )
+                break
+
+            case SettingsStack.FeatureConfigurations:
+                push( _settingsFeatureConfigurations )
+                break
+
             case SettingsStack.Localization:
                 push( _settingLocalization )
                 break
 
-            case SettingsStack.UserMode:
-                push( _settingUserMode )
+            case SettingsStack.AdvancedMode:
+                push( _settingAdvancedMode )
                 break
 
             default:
@@ -251,23 +268,25 @@
         }
     }
 
-    SettingsInformation         { id: _settingsInformation          }
-    SettingsVolumeBrightness    { id: _settingsVolumeBrightness     }
-    SettingsWiFi                { id: _settingsWiFi                 }
-    SettingsDGCleaning          { id: _settingsDGCleaning           }
-    SettingsDGScheduling        { id: _settingsDGScheduling         }
-    SettingsServicePassword     { id: _servicePassword              }
-    SettingsDateTime            { id: _settingsDateTime             }
-    SettingsExportLogs          { id: _settingsExportLogs           }
-    SettingsROInput             { id: _settingsRoInput              }
-    SettingsManufacturingSetup  { id: _settingsDeviceConfiguration  }
-    SettingsDeviceRegistration  { id: _settingsDeviceRegistration   }
-    SettingsRootSSHAccess       { id: _SettingsRootSSHAccess        }
-    SettingsFactoryReset        { id: _serviceFactoryReset          }
-    SettingsDecommission        { id: _serviceDecommission          }
-    SettingsInstitutionalRecord { id: _settingsInstitutionalRecord  }
-    SettingsLocalization        { id: _settingLocalization          }
-    SettingsUserMode            { id: _settingUserMode              }
+    SettingsInformation             { id: _settingsInformation          }
+    SettingsVolumeBrightness        { id: _settingsVolumeBrightness     }
+    SettingsWiFi                    { id: _settingsWiFi                 }
+    SettingsDGCleaning              { id: _settingsDGCleaning           }
+    SettingsDGScheduling            { id: _settingsDGScheduling         }
+    SettingsServicePassword         { id: _servicePassword              }
+    SettingsDateTime                { id: _settingsDateTime             }
+    SettingsExportLogs              { id: _settingsExportLogs           }
+    SettingsROInput                 { id: _settingsRoInput              }
+    SettingsManufacturingSetup      { id: _settingsDeviceConfiguration  }
+    SettingsDeviceRegistration      { id: _settingsDeviceRegistration   }
+    SettingsRootSSHAccess           { id: _SettingsRootSSHAccess        }
+    SettingsFactoryReset            { id: _serviceFactoryReset          }
+    SettingsDecommission            { id: _serviceDecommission          }
+    SettingsInstitutionalRecord     { id: _settingsInstitutionalRecord  }
+    SettingsAdvancedInstitutional   { id: _settingsAdvancedInstitutional}
+    SettingsLocalization            { id: _settingLocalization          }
+    SettingsFeatureConfigurations   { id: _settingsFeatureConfigurations}
+    SettingsAdvancedMode        { id: _settingAdvancedMode          }
 
     function gotoServiceMode( vservice ) {
         //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)
@@ -288,17 +307,6 @@
         }
     }
 
-    Connections { target: vAdjustmentInstitutionalRecord
-        function onAdjustmentTriggered              ( vValue ) {
-            if ( vAdjustmentInstitutionalRecord.adjustment_Accepted ) {
-                _settingsHome.notificationText = ""
-            }
-            else {
-                _settingsHome.notificationText = vAdjustmentInstitutionalRecord.text()
-            }
-        }
-    }
-
     Connections { target: vTDOpMode
         function onServiceChanged                   ( vValue ) { gotoServiceMode(                         vValue  )}
         function onStandbyWaitDisinfectChanged      ( vValue ) { page( _settingsHome                    , vValue  )}