Index: sources/gui/qml/main.qml
===================================================================
diff -u -r6b60df9d8468e2134c7de32bd0f6215cef33269b -rd61465fe416a56fdb38e79bdeca6bc43dc655be2
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 6b60df9d8468e2134c7de32bd0f6215cef33269b)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision d61465fe416a56fdb38e79bdeca6bc43dc655be2)
@@ -6,8 +6,8 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    main.qml
- * \author  (last)      Mohammed Suleiman
- * \date    (last)      21-Jul-2023
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      26-Jul-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  24-Sep-2019
  *
@@ -259,7 +259,7 @@
         function isManager    () { _mainMenu.itemPressed(1) }
         function isSettings   () { _mainMenu.itemPressed(2) }
 
-        disable                 : _GuiView.manufactSetup
+        disable                 : _GuiView.manufactSetup || _GuiView.updateSetup
         hidden                  : true // it should be hidden by default since the landing screen changed to init and it does not have the main menu until the POST passes.
         titles                  : [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ]
         visibleItems            : [       true        ,       false     ,       true       ]
Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
===================================================================
diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -rd61465fe416a56fdb38e79bdeca6bc43dc655be2
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision d61465fe416a56fdb38e79bdeca6bc43dc655be2)
@@ -113,7 +113,7 @@
           prime_salineSetup                         ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_SALINE_SETUP_STATE                       );
           prime_salinePurgeAir                      ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_SALINE_PURGE_AIR_STATE                   );
           prime_salineCirculateBloodCircuit         ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE          );
-          prime_reservoiOneFillComplete             ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE        );
+          prime_reservoirOneFillComplete            ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE        );
           prime_dialysateDialyzer                   ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_DIALYSATE_DIALYZER_STATE                 );
           prime_salineDialyzerSetup                 ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_SALINE_DIALYZER_SETUP_STATE              );
           prime_salineDialyzer                      ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_SALINE_DIALYZER_STATE                    );
@@ -122,6 +122,19 @@
           prime_wetSelfTests                        ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_WET_SELF_TESTS_STATE                     );
           prime_pause                               ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_PAUSE                                    );
           prime_complete                            ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_COMPLETE                                 );
+
+          prime__BloodCircuit                       ( _prime_salineSetup                ||
+                                                      _prime_salinePurgeAir             ||
+                                                      _prime_salineCirculateBloodCircuit);
+          prime__DialysateCircuit                   ( _prime_reservoirOneFillComplete   ||
+                                                      _prime_dialysateDialyzer          ||
+                                                      _prime_salineDialyzerSetup        ||
+                                                      _prime_salineDialyzer             ||
+                                                      _prime_reservoirTwoFillComplete   ||
+                                                      _prime_dialysateBypass            );
+          prime__WetSelfTests                       ( _prime_wetSelfTests               );
+
+
     }
     prime(mPrime); // it's the main even so moved last to have all the sub-states updated prior to.