Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r8cf828e5768d491c3e329c39b108624832054e94 -r4fd94e57fbbdb54c779f28ef50f0997e8eefee5f
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 8cf828e5768d491c3e329c39b108624832054e94)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 4fd94e57fbbdb54c779f28ef50f0997e8eefee5f)
@@ -40,16 +40,13 @@
 
     property var currentScreen: stackView.currentItem
 
-    signal isCreateRx(bool vState) // pass upstream to HeaderBar
-
     stackView.initialItem   : _root.initialItem
 
     // Standby / Disinfection
     DisinfectStack                  { id: _disinfectStack                   }
     // Pre Treatment
-    PreTreatmentStack               { id: _preTreatmentStack
-        onIsCreateRxChanged     : _root.isCreateRx(_preTreatmentStack.isCreateRx)
-    }
+    PreTreatmentStack               { id: _preTreatmentStack                }
+
     // In TreatmentStack
     TreatmentStack                  { id: _treatmentStack                   }
 
@@ -64,7 +61,10 @@
     MainInitialization              { id: _postModeScreen                   }
 
     MainHome                        { id: _mainHome
-        onCreateTreatment               : { vPreTreatmentAdjustmentInitTreatment.doInitiate( )}
+        onCreateTreatment: function (vValue) {
+            vTreatmentCreate.treatmentModality = vValue
+            vPreTreatmentAdjustmentInitTreatment.doInitiate(                    )
+        }
     }
 
     Connections { target: vTDOpMode