Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r28a383251ad37c669202c0a717ff90b8fc21a442 -r07e0c7bd409782cab96a4ae761ee3f819bdb8639
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 28a383251ad37c669202c0a717ff90b8fc21a442)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639)
@@ -22,6 +22,9 @@
 import "qrc:/pages/treatment/adjustments"
 import "qrc:/pages/pretreatment/create"
 import "qrc:/pages/posttreatment"
+import "qrc:/pages/posttreatment/rinseback"
+import "qrc:/pages/posttreatment/recirculate"
+import "qrc:/pages/posttreatment/end"
 
 /*!
  * \brief   TreatmentStack is the screen
@@ -205,7 +208,7 @@
     PostTreatmentBloodPrime         { id: _postTreatmentBloodPrime          }
     // Rinseback
     PostTreatmentRinsebackInit      { id: _postTreatmentRinsebackInit
-        onStartClicked              : vTreatmentAdjustmentRinseback.doStart         () //82.0
+        onRinsebackClicked          : vTreatmentAdjustmentRinseback.doStart         () //82.0
         onTreatmentEndClicked       : vTreatmentAdjustmentRinseback.doTreatmentEnd  () //82.8
         onTreatmentBackClicked      : vTreatmentAdjustmentRinseback.doTreatmentBack () //82.9
     }
@@ -218,8 +221,8 @@
     }
     PostTreatmentRinsebackComplete  { id: _postTreatmentRinsebackComplete
         onAdditionalClicked         : vTreatmentAdjustmentRinseback.doAdditional    () //82.6
-        onTreatmentEndClicked       : vTreatmentAdjustmentRinseback.doConfirm       () //82.7
-        onConfirmClicked            : vTreatmentAdjustmentRinseback.doTreatmentEnd  () //82.8
+        onConfirmClicked            : vTreatmentAdjustmentRinseback.doConfirm       () //82.7
+        onTreatmentEndClicked       : vTreatmentAdjustmentRinseback.doTreatmentEnd  () //82.8
     }
     PostTreatmentAdditional         { id: _postTreatmentAdditional          }
     // Recirculate
@@ -233,7 +236,10 @@
     }
 
     // Treatment Complete
-    PostTreatmentComplete           { id: _postTreatmentComplete            }
+    PostTreatmentEnd                { id: _postTreatmentEnd
+        onRinsebackClicked:         { console.debug(" ----- ", "PostTreatmentEnd", "onRinsebackClicked")} //87.0
+    }
+    PostTreatmentEndPaused          { id: _postTreatmentEndPaused           }
 
     // ---------- Manages Responses ----------
     Connections { target: vTreatmentAdjustmentRinseback
@@ -353,25 +359,35 @@
     // also with what ever order they have been push with the reverse/correct animation will be poped or pushed.
     Connections { target: vHDTreatmentStates
         // Blood Prime
-        onTxBloodPrimeChanged       : { if ( vtxBloodPrime      ) { back( _postTreatmentBloodPrime          )}}
+        onTxBloodPrimeChanged   : { if ( vtxBloodPrime      ) { page( _postTreatmentBloodPrime          )}}
+        onBpRampChanged         : { if ( vbpRamp            ) { /* No action defined yet */              }}
 
         // in-Treatmet
-        onTxDialysisRunningChanged  : { if ( vtxDialysisRunning ) { back( _treatmentStart                   )}}
-        onTxStopChanged             : { /* only will be used to update the in-treatment screen */             }
-        onTxDialysisEndChanged      : { if ( vtxDialysisEnd     ) { back( _postTreatmentComplete            )}}
+        onTxDialysisChanged     : { if ( vtxDialysis        ) { page( _treatmentStart                   )}}
 
-        // shall push the rinseback stack which we don't have it yet.
+        // shall push the rinseback stack which hasn't been implemented yet.
         // Rinseback
-        onTxRinsebackChanged        : { if ( vtxRinseback       ) { back( _postTreatmentRinsebackInit       )}}
-        onRbInitChanged             : { if ( vrbInit            ) { back( _postTreatmentRinsebackInit       )}}
-        onRbRunChanged              : { if ( vrbRun             ) { back( _postTreatmentRinseback           )}}
-        onRbPausedChanged           : { if ( vrbPaused          ) { back( _postTreatmentRinseback           )}}
-        onRbStopChanged             : { if ( vrbStop            ) { back( _postTreatmentRinsebackComplete   )}}
-        onRbAdditionalChanged       : { if ( vrbAdditional      ) { back( _postTreatmentAdditional          )}}
+        onTxRinsebackChanged    : { if ( vtxRinseback       ) { page( _postTreatmentRinsebackInit       )}}
+        onRbInitChanged         : { if ( vrbInit            ) { page( _postTreatmentRinsebackInit       )}}
+        onRbRunChanged          : { if ( vrbRun             ) { page( _postTreatmentRinseback           )}}
+        onRbPausedChanged       : { if ( vrbPaused          ) { page( _postTreatmentRinseback           )}}
+        onRbStopChanged         : { if ( vrbStop            ) { page( _postTreatmentRinsebackComplete   )}}
+        onRbAdditionalChanged   : { if ( vrbAdditional      ) { page( _postTreatmentAdditional          )}}
 
+        // shall push the recirculate stack which hasn't been implemented yet.
         // Recirculate
-        onTxRecirculateChanged      : { if ( vtxRecirculate     ) { back( _postTreatmentRecirculate         )}}
-        onRcStartedChanged          : { if ( vrcStarted         ) { back( _postTreatmentRecirculate         )}}
-        onRcStoppedChanged          : { if ( vrcStopped         ) { back( _postTreatmentReconnect           )}}
+        onTxRecirculateChanged  : { if ( vtxRecirculate     ) { page( _postTreatmentRecirculate         )}}
+        onRcStartedChanged      : { if ( vrcStarted         ) { page( _postTreatmentRecirculate         )}}
+        onRcStoppedChanged      : { if ( vrcStopped         ) { page( _postTreatmentReconnect           )}}
+
+        // Treatment End
+        onTxEndChanged          : { if ( vtxEnd             ) { page( _postTreatmentEnd                 )}}
+        onTeWaitRinsebackChanged: { if ( vteWaitRinseback   ) { page( _postTreatmentEnd                 )}}
+        onTePausedChanged       : { if ( vtePaused          ) { page( _postTreatmentEndPaused           )}}
+
+        // Treatment Stop
+        onTxStopChanged         : { if ( vtxStop            ) { page( _treatmentStart                   )}}
+        onTsRecirculateChanged  : { if ( vtsRecirculate     ) { /* No action defined yet */              }}
+        onTsRecirculateNoChanged: { if ( vtsRecirculateNo   ) { /* No action defined yet */              }}
     }
 }