Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r85105bf140b9b7c4ffc8f0d176f5f01dd2261867
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 85105bf140b9b7c4ffc8f0d176f5f01dd2261867)
@@ -80,8 +80,8 @@
     {Gui::GuiActionType::ID_Ultrafiltration                         ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_IsolatedUF                              ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_Heparin                                 ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::ID_Rinseback                               ,   6 * 4       }, // 6 parameters each 4bytes
-    {Gui::GuiActionType::ID_Recirculate                             ,   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
     {Gui::GuiActionType::ID_BloodPrime                              ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_TreatmentStop                           ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_TDAirBubbleData                         ,   2 * 4       }, // 2 parameters each 4bytes
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r04892d957c8f85eba1dc0550c2c9b01eef86efe9 -r85105bf140b9b7c4ffc8f0d176f5f01dd2261867
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 04892d957c8f85eba1dc0550c2c9b01eef86efe9)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 85105bf140b9b7c4ffc8f0d176f5f01dd2261867)
@@ -54,6 +54,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