Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b)
@@ -1,16 +1,16 @@
 /*!
- *
+ * 
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- *
+ * 
  * \file TreatmentStack.qml
  * \author (last) Behrouz NematiPour
  * \date (last) 16-Oct-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 27-Jan-2020
- *
+ * 
  */
 
 // Qt
@@ -81,11 +81,11 @@
 
     TreatmentHome               { id:       _treatmentHome
         onTreatmentStarted      : push( _treatmentStart )
-        onTreatmentCreated      : push( _treatmentCreate)
+        onTreatmentCreated      : vTreatmentCreate.doSelectParameters()
     }
 
     TreatmentStart              { id:       _treatmentStart
-        onBackClicked           : pop ()
+        onBackClicked           : popToItem(_treatmentHome)
         onSectionFlowClicked    : {
             _treatmentAdjustmentFlow.open()
         }
@@ -109,23 +109,23 @@
     }
 
     TreatmentCreate             { id:       _treatmentCreate
-        onBackClicked          : pop()
-        onContinueClicked      : vCreateTreatment.onFinishedCreate()
+        onClickedBack           : {vTreatmentCreate.doCancelSelectingParameters() }
+        onClickedContinue       : {vTreatmentCreate.doFinishedCreate();  }
     }
 
     TreatmentConfirm             { id:       _treatmentConfirm
-        onBackClicked           : pop()
-        onConfirmClicked        : vCreateTreatment.onFinishedConfirm()
+        onClickedBack           : {vTreatmentCreate.doCancelConfirmParameters()   }
+        onClickedConfirm        : {vTreatmentCreate.doFinishedConfirm(); }
     }
 
     TreatmentPrime             { id:       _treatmentPrime
-        onBackClicked           : pop()
-        onContinueClicked       : vCreateTreatment.onFinishedPrime()
+        onClickedBack           : {vTreatmentCreate.doRequestPop()       }
+        onClickedContinue       : {vTreatmentCreate.doFinishedPrime();   }
     }
 
     TreatmentBegin             { id:       _treatmentBegin
-        onBackClicked           : pop()
-        onStartClicked          : vCreateTreatment.onStart()
+        onClickedBack           : {vTreatmentCreate.doRequestPop()       }
+        onClickedStart          : {vTreatmentCreate.doStartTreatment();  }
     }
 
     //// Treatment Adjustment Dialogs
@@ -297,9 +297,12 @@
         }
     }
 
-    Connections { target: vCreateTreatment
-        onShowConfirm : { push(_treatmentConfirm) }
-        onShowPrime   : { push(_treatmentPrime  ) }
-        onShowBegin   : { push(_treatmentBegin  ) }
+    Connections { target: vTreatmentCreate
+        onShowCreate           : { push(_treatmentCreate)  }
+        onShowConfirm          : { push(_treatmentConfirm) }
+        onShowPrime            : { push(_treatmentPrime)   }
+        onShowBegin            : { push(_treatmentBegin)   }
+        onPop                  : { pop()                   }
+        onShowTreatmentStart   : { push(_treatmentStart)   }
     }
 }