Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r58014dae52ee6357e88b9b03bcad457ddcb432e8 -rfd25d67f37410037f22be9c6e958b100e3790de9
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 58014dae52ee6357e88b9b03bcad457ddcb432e8)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision fd25d67f37410037f22be9c6e958b100e3790de9)
@@ -26,6 +26,9 @@
 import VTreatmentAdjustmentUltrafiltrationConfirm   0.1
 import VTreatmentAdjustmentPressuresLimits          0.1
 import VTreatmentAdjustmentHeparin                  0.1
+import VTreatmentRinseback                          0.1
+import VTreatmentAdjustmentRinseback                0.1
+import VTreatmentAdjustmentRecirculate              0.1
 
 //  Qml imports
 import "qrc:/globals"
@@ -46,14 +49,18 @@
     stackView.initialItem   : _treatmentHome
 
     // Views
+    VHDTreatmentStates                          { id: vHDTreatmentStates                            }
+
     VTreatmentRanges                            { id: vTreatmentRanges                              }
     VTreatmentAdjustmentSaline                  { id: vTreatmentAdjustmentSaline                    }
-    VHDTreatmentStates                          { id: vHDTreatmentStates                            }
     VTreatmentAdjustmentUltrafiltrationState    { id: vTreatmentAdjustmentUltrafiltrationState      }
     VTreatmentAdjustmentUltrafiltrationEdit     { id: vTreatmentAdjustmentUltrafiltrationEdit       }
     VTreatmentAdjustmentUltrafiltrationConfirm  { id: vTreatmentAdjustmentUltrafiltrationConfirm    }
     VTreatmentAdjustmentPressuresLimits         { id: vTreatmentAdjustmentPressuresLimits           }
     VTreatmentAdjustmentHeparin                 { id: vTreatmentAdjustmentHeparin                   }
+    VTreatmentRinseback                         { id: vTreatmentRinseback                           }
+    VTreatmentAdjustmentRinseback               { id: vTreatmentAdjustmentRinseback                 }
+    VTreatmentAdjustmentRecirculate             { id: vTreatmentAdjustmentRecirculate               }
 
     // ultrafiltration state information bar properties
     readonly property bool   isUFPaused         : vHDTreatmentStates.ufPaused
@@ -222,12 +229,35 @@
         }
     }
 
-    PostTreatmentRinseback          { id: _postTreatmentRinseback      }
-    PostTreatmentRinsebackComplete  { id: _postTreatmentRinsebackComplete       }
-    PostTreatmentRecirculate        { id: _postTreatmentRecirculate    }
-    PostTreatmentComplete           { id: _postTreatmentComplete       }
+    PostTreatmentRinseback          { id: _postTreatmentRinseback
+        onResumeClicked             : vTreatmentAdjustmentRinseback     .doResume       ()
+        onPauseClicked              : vTreatmentAdjustmentRinseback     .doPause        ()
+        onAccelerateClicked         : vTreatmentAdjustmentRinseback     .doIncrement    ()
+        onDeccelerateClicked        : vTreatmentAdjustmentRinseback     .doDecrement    ()
+        onEndClicked                : vTreatmentAdjustmentRinseback     .doEnd          ()
+    }
 
+    PostTreatmentRinsebackComplete  { id: _postTreatmentRinsebackComplete
+        onAdditionalClicked         : vTreatmentAdjustmentRinseback     .doAdditional   ()
+        onEndClicked                : vTreatmentAdjustmentRinseback     .doTreatmentEnd ()
+        onRecirculateClicked        :{ /*?*/ }
+    }
+
+    PostTreatmentRecirculate        { id: _postTreatmentRecirculate
+        onResumeClicked             : { /*?*/ }
+        onEndClicked                : vTreatmentAdjustmentRecirculate   .doTreatmentEnd ()
+    }
+
+    PostTreatmentComplete           { id: _postTreatmentComplete            }
+
     // ---------- Manages Responses ----------
+    Connections { target: vTreatmentAdjustmentRinseback
+        onAdjustmentTriggered: {
+            console.debug(vTreatmentAdjustmentRinseback.text())
+            _postTreatmentRinseback.reasonText = vTreatmentAdjustmentRinseback.text();
+        }
+    }
+
     Connections { target: vTreatmentAdjustmentDuration
         onAdjustmentTriggered   : {
             if ( vTreatmentAdjustmentDuration.adjustment_Accepted ) {
@@ -337,8 +367,8 @@
     // and is more optimized and will never leave screen empty
     // also with what ever order they have been push with the reverse/correct animation will be poped or pushed.
     Connections { target: vHDTreatmentStates
-        onTxStartChanged: {
-            if ( vHDTreatmentStates.txStart ) {
+        onTxDialysisRunningChanged: {
+            if ( vHDTreatmentStates.txDialysisRunning ) {
                 back( _treatmentStart )
             }
         }
@@ -354,6 +384,12 @@
             }
         }
 
+        onTxStopChanged: {
+            if ( vHDTreatmentStates.txStop ) {
+                back( _postTreatmentComplete )
+            }
+        }
+
         onTxRinsebackChanged: {
             if ( vHDTreatmentStates.txRinseback ) {
                 // it may be navigated from complete or stop alarm dialog,
@@ -363,6 +399,21 @@
             }
         }
 
+        onRbStopChanged: {
+            if ( vHDTreatmentStates.rbStop ) {
+                back( _postTreatmentRinsebackComplete )
+            }
+        }
+
+        onRbAdditionalChanged: {
+            if ( vHDTreatmentStates.rbAdditional ) {
+                // it may be navigated from complete or stop alarm dialog,
+                // which in the later case it can't be replaced with main treatment
+                // since user is able to go back to main treament if it's not timed out.
+                back( _postTreatmentRinseback )
+            }
+        }
+
         onTxRecirculateChanged: {
             if ( vHDTreatmentStates.txRecirculate ) {
                 // application state by design is navigating always from Rinseback to recirculate