Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r54b9a7699a46c0fde39b4d1a20b9f362bab435af -rc8906f10980b8c596aaeb53e149a42c68df85a30
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 54b9a7699a46c0fde39b4d1a20b9f362bab435af)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision c8906f10980b8c596aaeb53e149a42c68df85a30)
@@ -78,7 +78,7 @@
     {Gui::GuiActionType::ID_Saline                                  ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_Vitals                                  ,   3 * 4       }, // 3 parameters each 4bytes
     {Gui::GuiActionType::ID_Ultrafiltration                         ,   4 * 4       }, // 4 parameters each 4bytes
-    {Gui::GuiActionType::ID_IsolatedUF                              ,   4 * 4       }, // 4 parameters each 4bytes
+    {Gui::GuiActionType::ID_IsolatedUF                              ,   6 * 4       }, // 6 parameters each 4bytes
     {Gui::GuiActionType::ID_Heparin                                 ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_Rinseback                               ,   7 * 4       }, // 6 parameters each 4bytes
     {Gui::GuiActionType::ID_Recirculate                             ,   1 * 4       }, // 1 parameters each 4bytes
@@ -192,6 +192,10 @@
     {Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp           ,   2 * 4       }, // 2 parameter  each 4bytes
 
     // ----
+    {Gui::GuiActionType::ID_AdjustIsoUFStateReq                     ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustIsoUFStateRsp                     ,   2 * 4       }, // 2 parameter  each 4bytes
+
+    // ----
     {Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq            ,   1 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp            ,   4 * 4       }, // 4 parameters each 4bytes
 
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 -rc8906f10980b8c596aaeb53e149a42c68df85a30
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision c8906f10980b8c596aaeb53e149a42c68df85a30)
@@ -53,6 +53,9 @@
 
     stackView.initialItem   : _treatmentHome
 
+    stackView.onCurrentItemChanged: if ( stackView.currentItem != _endTreatmentRinsebackStack   &&
+                                         stackView.currentItem != _endTreatmentRecirculateStack ) { _headerBar.activeStack = stackView }
+
     readonly property bool   isTreatmentPaused  : vTDTreatmentStates.txStop
     readonly property bool   isSBInProgress     : ( vTDTreatmentStates.sbRunning || vTDTreatmentStates.sbWaitPump )
     readonly property bool   isTreatmentEnd     : vTDTreatmentStates.txEnd
Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -r6c075a49d02dbe9a3c7636a7b01bceab597b000b -rc8906f10980b8c596aaeb53e149a42c68df85a30
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision 6c075a49d02dbe9a3c7636a7b01bceab597b000b)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision c8906f10980b8c596aaeb53e149a42c68df85a30)
@@ -63,8 +63,6 @@
     width   : _circle.width
     height  : _circle.height
 
-    onIsCompleteChanged: _rinsebackCompleteDialog.isTxCompleted = _root.isComplete
-
     signal clicked()
 
     ProgressCircle { id: _circle
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 -rc8906f10980b8c596aaeb53e149a42c68df85a30
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision c8906f10980b8c596aaeb53e149a42c68df85a30)
@@ -163,14 +163,12 @@
         ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE                                                    )
         ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_STOP_STATE                                                      )
         ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE                                            )
-        ENUM_CHECK  ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE                                         )
         ENUM_CHECK_C( GuiRinsebackStates, NUM_OF_RINSEBACK_STATES                                                   ) }
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_STOP_INIT_STATE                         , rbInit                );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_RUN_STATE                               , rbRun                 );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE                            , rbPaused              );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_STOP_STATE                              , rbStop                );
         ENUM_READ   ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE                    , rbAdditional          );
-        ENUM_READ   ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE                 , rbReconnect           );
     }
     txRinseback ( mRinseback ); // it's the main rinseback event so moved last to have all the sub-rinseback-states updated prior to.
 
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h
===================================================================
diff -u -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 -rc8906f10980b8c596aaeb53e149a42c68df85a30
--- sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision c8906f10980b8c596aaeb53e149a42c68df85a30)
@@ -98,7 +98,6 @@
     PROPERTY( bool   , rbPaused                 , false) ///< RINSEBACK_PAUSED_STATE                    = 2 # Rinseback paused state of the rinseback sub-mode state machine
     PROPERTY( bool   , rbStop                   , false) ///< RINSEBACK_STOP_STATE                      = 3 # Rinseback stopped (done) state of the rinseback sub-mode state machine
     PROPERTY( bool   , rbAdditional             , false) ///< RINSEBACK_RUN_ADDITIONAL_STATE            = 4 # Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine
-    PROPERTY( bool   , rbReconnect              , false) ///< RINSEBACK_RECONNECT_PATIENT_STATE         = 5 # Rinseback reconnect state of the rinseback sub-mode state machine
 
     // Recirculate states
     PROPERTY( bool   , rcDisconnect             , true ) ///< TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine