Index: sources/gui/qml/main.qml
===================================================================
diff -u -rac51681874b0ad12991396d859b434166cab88b2 -r72289d4b682e419df5d6f7210eca83d97cd657ae
--- sources/gui/qml/main.qml	(.../main.qml)	(revision ac51681874b0ad12991396d859b434166cab88b2)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 72289d4b682e419df5d6f7210eca83d97cd657ae)
@@ -75,6 +75,8 @@
 import VTreatmentBloodPrime                                 0.1
 import VTreatmentStop                                       0.1
 import VTreatmentRanges                                     0.1
+import VTreatmentHeparin                                    0.1
+
 // Pre-Treatment
 import VPreTreatmentAdjustmentInitTreatment                 0.1
 import VDGFilterFlush                                       0.1
@@ -108,7 +110,6 @@
 import VDDLevel                                             0.1
 import VDDBloodLeak                                         0.1
 // FP Data
-import VFPValvesStates                                      0.1
 import VFPROPump                                            0.1
 import VFPPressures                                         0.1
 import VFPLevel                                             0.1
@@ -124,6 +125,7 @@
 import VTreatmentAdjustmentUltrafiltrationConfirm           0.1
 import VTreatmentAdjustmentPressuresLimits                  0.1
 import VTreatmentAdjustmentSaline                           0.1
+import VTreatmentAdjustmentVitals                           0.1
 import VTreatmentAdjustmentHeparin                          0.1
 import VTreatmentAdjustmentRinseback                        0.1
 import VTreatmentAdjustmentRecirculate                      0.1
@@ -142,6 +144,7 @@
 import "qrc:/globals"
 import "qrc:/pages"
 import "qrc:/pages/treatment"
+import "qrc:/pages/treatment/adjustments"
 import "qrc:/pages/settings"
 import "qrc:/components"
 import "qrc:/dialogs"
@@ -181,6 +184,7 @@
                 vTreatmentVitals.doReset()
                 vTreatmentCreate.txCode = ""
                 vTreatmentCreate.parametersValidated = false
+                vTreatmentCreate.parametersConfirmed = false
             }
         }
     }
@@ -190,16 +194,12 @@
 
     VTreatmentBloodFlow                                 { id: vTreatmentBloodFlow                                   }
     VTreatmentVitals                                    { id: vTreatmentVitals
-        interval    : vTreatmentCreate.bloodPressureMeasureInterval
-        enableDialog:  vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment
-        // As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval.
-        onEnableDialogChanged : {
-            if ( vTreatmentVitals.enableDialog ) {
-                vTreatmentVitals.doTimerStart()
-            }
-            else {
-                vTreatmentVitals.doTimerStop()
-            }
+        interval        : vTreatmentCreate.bloodPressureMeasureInterval
+        canStartInterval: vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment
+        enableBPCuff    : true  // TODO: PRS 343 update with enable/disable Integrated Blood Pressure Cuff
+        onCanStartIntervalChanged : {
+            if ( vTreatmentVitals.canStartInterval )    { vTreatmentVitals.doTimerStart()   }
+            else                                        { vTreatmentVitals.doTimerStop()    }
         }
     }
 
@@ -226,6 +226,8 @@
     VTreatmentRinseback                                 { id: vTreatmentRinseback                                   }
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VTreatmentStop                                      { id: vTreatmentStop                                        }
+    VTreatmentHeparin                                   { id: vTreatmentHeparin                                     }
+
     // ---- DD
     VDGDrainPump                                        { id: vDGDrainPump                                          }
     VDDHeaters                                          { id: vDDHeaters                                            }
@@ -244,7 +246,6 @@
     VDDLevel                                            { id: vDDLevel                                              }
     VDDBloodLeak                                        { id: vDDBloodLeak                                          }
     // --- FP Data
-    VFPValvesStates                                     { id: vFPValvesStates                                       }
     VFPROPump                                           { id: vFPROPump                                             }
     VFPPressures                                        { id: vFPPressures                                          }
     VFPLevel                                            { id: vFPLevel                                              }
@@ -274,6 +275,7 @@
 
     VTreatmentRanges                                    { id: vTreatmentRanges                                      }
     VTreatmentAdjustmentSaline                          { id: vTreatmentAdjustmentSaline                            }
+    VTreatmentAdjustmentVitals                          { id: vTreatmentAdjustmentVitals                            }
     VTreatmentAdjustmentUltrafiltrationState            { id: vTreatmentAdjustmentUltrafiltrationState              }
     VTreatmentAdjustmentUltrafiltrationEdit             { id: vTreatmentAdjustmentUltrafiltrationEdit               }
     VTreatmentAdjustmentUltrafiltrationConfirm          { id: vTreatmentAdjustmentUltrafiltrationConfirm            }
@@ -354,9 +356,12 @@
 
     // Dialogs
     AcidConcentrateAdjustment   { id: _acidConcentrateAdjustment   }
+    HeaderbarPrescription       { id: _headerbarPrescription       }
     HeaderbarWiFi               { id: _headerbarWifi               }
     HeaderbarStorage            { id: _headerbarStorage            }
     HeaderbarSettings           { id: _headerbarSettings           }
+    HeaderbarInformation        { id: _headerbarInformation        }
+    TreatmentAdjustmentVitals   { id: _treatmentAdjustmentVitals    }
     LockDialog                  { id: _lockDialog                  }
     AlarmItem                   { id: _alarmItem        ;   z: 996 }
     PowerItem                   { id: _powerItem        ;   z: 997 }