Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r670f257c9b88d3e5506eccaad111bec914102a72 -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 670f257c9b88d3e5506eccaad111bec914102a72)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6)
@@ -59,7 +59,11 @@
             _treatmentAdjustmentDuration.open()
         }
         onSectionUltrafiltrationClicked: {
-            _treatmentAdjustmentUltrafiltrationStart.open()
+            if ( vTreatmentUltrafiltrationState.isPaused ) {
+                _treatmentAdjustmentUltrafiltrationPaused.open()
+            } else {
+                _treatmentAdjustmentUltrafiltrationStart .open()
+            }
         }
     }
 
@@ -69,25 +73,21 @@
 
     //// Treatment Adjustment Dialogs
     TreatmentAdjustmentFlow     { id:       _treatmentAdjustmentFlow
-        dialysateFlowRateMinimum: vTreatmentRanges.treatmentRanges_Dialysate_Flow_Min
-        dialysateFlowRateMaximum: vTreatmentRanges.treatmentRanges_Dialysate_Flow_Max
-
         onCloseClicked          : close()
-        onConfirmClicked        : _GuiView.doAdjustBloodDialysateFlows(bloodFlowRateValue, dialysateFlowRateValue)
+        onConfirmClicked        : vTreatmentAdjustmentFlows.doAdjustment(bloodFlowRateValue, dialysateFlowRateValue)
     }
-
     TreatmentAdjustmentDuration { id:       _treatmentAdjustmentDuration
-        // durationMinimum: vTreatmentRanges.treatmentRanges_Duration_Min
-        // durationMaximum: vTreatmentRanges.treatmentRanges_Duration_Max
         onCloseClicked          : close()
-        onConfirmClicked        : _GuiView.doAdjustDuration(durationValue)
+        onConfirmClicked        : vTreatmentAdjustmentDuration.doAdjustment(durationValue)
     }
 
     TreatmentAdjustmentUltrafiltrationStart { id: _treatmentAdjustmentUltrafiltrationStart
         onCloseClicked          : close()
         onPauseClicked          : {
-            close()
-            _treatmentAdjustmentUltrafiltrationPaused.open()
+            // send pause to HD and wait.
+            // if accepted close()
+            // not accepted show error in notification
+            vTreatmentUltrafiltrationState.doPause()
         }
     }
 
@@ -98,9 +98,10 @@
             _treatmentAdjustmentUltrafiltrationEdit.open()
         }
         onResumeClicked         : {
-            // send HD resume and if accepted close()
+            // send resume to HD and wait.
+            // if accepted close()
             // not accepted show error in notification
-            close()
+            vTreatmentUltrafiltrationState.doResume()
         }
     }
 
@@ -125,4 +126,21 @@
             close()
         }
     }
+
+    Connections { target: vTreatmentUltrafiltrationState
+        onAdjustmentTriggered: {
+            console.debug(vTreatmentUltrafiltrationState.adjustment_Accepted , vTreatmentUltrafiltrationState.isPaused)
+            if ( vTreatmentUltrafiltrationState.adjustment_Accepted ) {
+                if ( vTreatmentUltrafiltrationState.isPaused ) {
+                    _treatmentAdjustmentUltrafiltrationStart .close()
+                    _treatmentAdjustmentUltrafiltrationPaused.open ()
+                } else {
+                    _treatmentAdjustmentUltrafiltrationPaused.close()
+                }
+            } else {
+                // Alert / Notification ?!
+            }
+        }
+    }
+
 }