Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -r9e57e4c990afab0996def98521d4f9fee83f96d8 -r79bf4dda5c027044ebd0014e7deac42a058a7fcf
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 9e57e4c990afab0996def98521d4f9fee83f96d8)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
@@ -32,21 +32,12 @@
     property alias startTreatmentButton : _startTreatmentRect.button
     property alias createTreatmentButton: _createTreatmentRect.button
 
+    signal treatmentStarted()
+    signal treatmentCreated()
+
     // 2 - Header
     LogoD { id: _headerLogo }
 
-    // exported properties
-    TreatmentStart  { id : _treatmentStart
-        onBackPressed: {
-            _treatmentStack.pop()
-        }
-    }
-    TreatmentCreate { id : _treatmentCreate
-        onBackPressed: {
-            _treatmentStack.pop()
-        }
-    }
-
     // Definitions
     Column {
         spacing: Variables.columnSpacing
@@ -57,20 +48,17 @@
         }
         TouchRect { id : _startTreatmentRect
             text.text: qsTr("START TREATMENT")
-            button.onClicked: {
-                _treatmentStack.push(_treatmentStart)
-            }
+            button.onClicked: treatmentStarted()
         }
         TouchRect { id : _createTreatmentRect
             text.text: qsTr("CREATE TREATMENT")
-            button.onClicked: {
-                _treatmentStack.push(_treatmentCreate)
-            }
+            button.onClicked: treatmentCreated()
         }
     }
 
     onVisibleChanged: {
         if (visible) {
+            console.debug("TreatmentHome", visible)
             _mainMenu.hidden = false
         }
     }