Index: sources/gui/qml/pages/TreatmentHome.qml
===================================================================
diff -u -r9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d -rfee7fabf49befb065c89248c19e15efc9ca194e4
--- sources/gui/qml/pages/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d)
+++ sources/gui/qml/pages/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision fee7fabf49befb065c89248c19e15efc9ca194e4)
@@ -1,6 +1,6 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved.
  * \copyright                                                       \n
  *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,  \n
  *          IN PART OR IN WHOLE,                                    \n
@@ -33,20 +33,16 @@
     property alias createTreatmentButton: _createTreatmentRect.button
 
     // exported properties
-    property int   favoriteCount: 0
+    //
 
-    TouchRect { id : _poweroff
-        width: 150
-        height: Variables.logoHeight
-        anchors {
-            top         : parent.top
-            right       : parent.right
-            topMargin   : (Variables.headerHeight - Variables.logoHeight) / 2
-            rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
+    TreatmentStart  { id : _treatmentStart
+        onBackPressed: {
+            _treatmentStack.pop()
         }
-        text.text: qsTr("Shutdown")
-        button.onPressed: {
-            _GuiView.doActionRequest(GuiActions.ActionPowerOff)
+    }
+    TreatmentCreate { id : _treatmentCreate
+        onBackPressed: {
+            _treatmentStack.pop()
         }
     }
 
@@ -59,10 +55,16 @@
             text: qsTr("Good Morning")
         }
         TouchRect { id : _startTreatmentRect
-            text.text: qsTr("FAVORITE TREATMENT (%1)").arg(favoriteCount)
+            text.text: qsTr("START TREATMENT")
+            button.onClicked: {
+                _treatmentStack.push(_treatmentStart)
+            }
         }
         TouchRect { id : _createTreatmentRect
-            text.text: qsTr("CUSTOM TREATMENT")
+            text.text: qsTr("CREATE TREATMENT")
+            button.onClicked: {
+                _treatmentStack.push(_treatmentCreate)
+            }
         }
     }
 }