Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -r3d0a160e4e8c0348c688ed5efe4d86dc66121e6b -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 3d0a160e4e8c0348c688ed5efe4d86dc66121e6b)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383)
@@ -29,6 +29,24 @@
  */
 ScreenItem { id: _root
     backgroundRect.color: Colors.backgroundMenu
+
+    TouchRect { id : _clearAlarmCondition
+        objectName: "_clearAlarmCondition"
+        width: 300
+        height: Variables.logoHeight
+        animated: true
+        anchors {
+            top         : parent.top
+            right       : _usbButton.left
+            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
+            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+        }
+        text.text: qsTr("Clear Alarm Condition")
+        button.onPressed: {
+            vAlarmStatus.doClearCondition();
+        }
+    }
+
     USBButton { id: _usbButton
         anchors {
             top         : parent.top
@@ -65,40 +83,6 @@
         }
     }
 
-    TouchRect { id : _endTreatmentButton
-        objectName: "_endTreatmentButton"
-        width: 200
-        height: Variables.logoHeight
-        animated: true
-        anchors {
-            top         : parent.top
-            right       : _usbButton.left
-            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
-            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
-        }
-        text.text: qsTr("End Treatment")
-        button.onPressed: {
-            vTreatmentEnd.doEndTreatmentRequest();
-        }
-    }
-
-    TouchRect { id : _clearAlarmCondition
-        objectName: "_clearAlarmCondition"
-        width: 300
-        height: Variables.logoHeight
-        animated: true
-        anchors {
-            top         : parent.top
-            right       : _endTreatmentButton.left
-            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
-            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
-        }
-        text.text: qsTr("Clear Alarm Condition")
-        button.onPressed: {
-            vAlarmStatus.doClearCondition();
-        }
-    }
-
     TitleText { id: _titleText
         anchors.horizontalCenter: parent.horizontalCenter;
         anchors.top: parent.top