Index: sources/gui/qml/main.qml
===================================================================
diff -u -r7e6a1b561b65b0e5092b312b074bad653eaba3ee -r601289deb20f7059b3af5bb19e16f53974262ceb
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 7e6a1b561b65b0e5092b312b074bad653eaba3ee)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 601289deb20f7059b3af5bb19e16f53974262ceb)
@@ -73,6 +73,7 @@
 import VTreatmentRinseback                                  0.1
 import VTreatmentRecirculate                                0.1
 import VTreatmentBloodPrime                                 0.1
+import VTreatmentSaline                                     0.1
 import VTreatmentStop                                       0.1
 import VTreatmentRanges                                     0.1
 // Pre-Treatment
@@ -228,6 +229,7 @@
     VTreatmentTime                                      { id: vTreatmentTime                                        }
     VTreatmentParametersSetPoint                        { id: vTreatmentParametersSetPoint                          }
     VTreatmentBloodPrime                                { id: vTreatmentBloodPrime                                  }
+    VTreatmentSaline                                    { id: vTreatmentSaline                                      }
     VTreatmentRinseback                                 { id: vTreatmentRinseback                                   }
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VTreatmentStop                                      { id: vTreatmentStop                                        }
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBolusVolume.qml
===================================================================
diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r601289deb20f7059b3af5bb19e16f53974262ceb
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBolusVolume.qml	(.../TreatmentAdjustmentBolusVolume.qml)	(revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBolusVolume.qml	(.../TreatmentAdjustmentBolusVolume.qml)	(revision 601289deb20f7059b3af5bb19e16f53974262ceb)
@@ -35,7 +35,7 @@
     titleText: qsTr("Fluid Delivery Settings")
 
     onAboutToShow: {
-        _fluidBolusVolume.value = vTreatmentCreate.salineBolusVolume
+        _fluidBolusVolume.value = vTreatmentSaline.target
     }
 
     Item { id: _contentItem
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
===================================================================
diff -u -rdd02afaf66a118eb50deb9313e6a809dd17b5864 -r601289deb20f7059b3af5bb19e16f53974262ceb
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml	(.../TreatmentAdjustmentDuration.qml)	(revision dd02afaf66a118eb50deb9313e6a809dd17b5864)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml	(.../TreatmentAdjustmentDuration.qml)	(revision 601289deb20f7059b3af5bb19e16f53974262ceb)
@@ -34,7 +34,10 @@
     confirmVisible      : false
     backVisible         : _treatmentDurationStack.stackView.depth > 1
 
-    onAboutToShow       : { _treatmentDurationStack.reset() }
+    onAboutToShow       : {
+        _treatmentAdjustmentDurationEdit.reset()
+        _treatmentDurationStack.reset()
+    }
     onClosed            : { _treatmentDurationStack.reset() }
     onBackClicked       : { _treatmentDurationStack.pop()   }
 
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml
===================================================================
diff -u -rb1462640e36df3f567c42aa8c8cbd6dafe865625 -r601289deb20f7059b3af5bb19e16f53974262ceb
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml	(.../TreatmentAdjustmentPressuresLimits.qml)	(revision b1462640e36df3f567c42aa8c8cbd6dafe865625)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml	(.../TreatmentAdjustmentPressuresLimits.qml)	(revision 601289deb20f7059b3af5bb19e16f53974262ceb)
@@ -38,10 +38,10 @@
     titleText: qsTr("Pressure Window Limit Settings")
 
     onAboutToShow: {
-        _arterialWindow.value           = vTreatmentCreate.arterialPressureLimitWindow
-        _venousWindow.value             = vTreatmentCreate.venousPressureLimitWindow
-        _venousAsymmetricWindow.value   = vTreatmentCreate.venousPressureLimitAsymtrc
-        _tmpWindow.value                = vTreatmentCreate.transmembranePressureLimitWindow
+        _arterialWindow.value           = vTreatmentPressureOcclusion.arterialPressure
+        _venousWindow.value             = vTreatmentPressureOcclusion.venousPressure
+        _venousAsymmetricWindow.value   = 0 // vTreatmentPressureOcclusion.venousLongPressure
+        _tmpWindow.value                = vTreatmentPressureOcclusion.tmpPressure
     }
 
     Item { id: _contentItem
@@ -74,8 +74,8 @@
                     unitText            : Variables.unitTextPressure
                     unitFontPixelSize   : Fonts.fontPixelContainerUnitSmall
                     isActive            : true
-                    minimum             : vTreatmentRanges.arterialPressureLimitWindowMin
-                    maximum             : vTreatmentRanges.arterialPressureLimitWindowMax
+                    minimum             : vTreatmentPressureOcclusion.arterialMin
+                    maximum             : vTreatmentPressureOcclusion.arterialMax
                     step                : vTreatmentRanges.arterialPressureLimitWindowRes
 
                     onDidChange         : function(vValue) { value = vValue }
@@ -88,8 +88,8 @@
                     unitText            : Variables.unitTextPressure
                     unitFontPixelSize   : _arterialWindow.unitFontPixelSize
                     isActive            : true
-                    minimum             : vTreatmentRanges.venousPressureLimitWindowMin
-                    maximum             : vTreatmentRanges.venousPressureLimitWindowMax
+                    minimum             : vTreatmentPressureOcclusion.venousMin
+                    maximum             : vTreatmentPressureOcclusion.venousMax
                     step                : vTreatmentRanges.venousPressureLimitWindowRes
 
                     onDidChange         : function(vValue) { value = vValue }
@@ -111,13 +111,13 @@
 
                 LabelUnitValueAdjuster { id: _tmpWindow
                     objectName          : "_tmpWindow"
-                    text            : qsTr("TMP Window")
+                    text                : qsTr("TMP Window")
                     titleFontPixelSize  : _arterialWindow.titleFontPixelSize
                     unitText            : Variables.unitTextPressure
                     unitFontPixelSize   : _arterialWindow.unitFontPixelSize
                     isActive            : true
-                    minimum             : vTreatmentRanges.transmembranePressureLimitWindowMin
-                    maximum             : vTreatmentRanges.transmembranePressureLimitWindowMax
+                    minimum             : vTreatmentPressureOcclusion.tmpMin
+                    maximum             : vTreatmentPressureOcclusion.tmpMax
                     step                : vTreatmentRanges.transmembranePressureLimitWindowRes
 
                     onDidChange         : function(vValue) { value = vValue }
Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -r0fc6d1c6c65ba935d7e5f0bc56130e99deada039 -r601289deb20f7059b3af5bb19e16f53974262ceb
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision 0fc6d1c6c65ba935d7e5f0bc56130e99deada039)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision 601289deb20f7059b3af5bb19e16f53974262ceb)
@@ -54,8 +54,6 @@
         readonly property string mesgRejectReason   : vTreatmentAdjustmentSaline.adjustment_ReasonText
     }
 
-    VTreatmentSaline  { id: vTreatmentSaline }
-
     contentItem: Column { id :_content
         spacing             : Variables.defaultMargin * 3