Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -rcb7aaf6a2207a1112a086676391d504bafbc58e4 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision cb7aaf6a2207a1112a086676391d504bafbc58e4)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec)
@@ -115,34 +115,34 @@
 
     SettingsBluetooth {
         id: _bluetooth
-        onClickedBack: _settingsStack.pop()
+        onBackClicked: _settingsStack.pop()
 
     }
 
     SettingsWifi {
         id: _wifi
-        onClickedBack: _settingsStack.pop()
+        onBackClicked: _settingsStack.pop()
 
     }
 
     SettingsDeviceInformation {
         id: _deviceInformation
-        onClickedBack: _settingsStack.pop()
+        onBackClicked: _settingsStack.pop()
     }
 
     SettingsDateTimeSet {
         id: _dateTimeSet
-        onClickedBack: _settingsStack.pop()
+        onBackClicked: _settingsStack.pop()
     }
 
     SettingsAlarmVolume {
         id: _alarmVolume
-        onClickedBack: _settingsStack.pop()
+        onBackClicked: _settingsStack.pop()
     }
 
     SettingsBrightness {
         id: _brightness
-        onClickedBack: _settingsStack.pop()
+        onBackClicked: _settingsStack.pop()
     }
 
     Column {
@@ -181,21 +181,20 @@
                 vDateTime.doGetCurrentTime()
                 push(_dateTimeSet)
             }
+            visible: vServiceMode.isServiceMode
         }
         SettingsItem { id: _itemAlarmVolume
             title   : qsTr("Alarm Volume")
             onClicked: {
                 push(_alarmVolume)
             }
-            visible: vServiceMode.isServiceMode
         }
         SettingsItem { id: _itemBrightness
             title   : qsTr("Brightness")
             onClicked: {
                 vBrightness.doGetBrightness()
                 push(_brightness)
             }
-            visible: vServiceMode.isServiceMode
         }
     }