Index: sources/gui/qml/compounds/AutoStepController.qml
===================================================================
diff -u -r0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29 -r19acf57838bc97979052d626f3e05d46310b6335
--- sources/gui/qml/compounds/AutoStepController.qml	(.../AutoStepController.qml)	(revision 0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29)
+++ sources/gui/qml/compounds/AutoStepController.qml	(.../AutoStepController.qml)	(revision 19acf57838bc97979052d626f3e05d46310b6335)
@@ -6,8 +6,8 @@
 import "qrc:/components"
 
 IconButton { id  : _root
-    property int interval   : 5000
-    property bool isPlaying : false // initial state
+    property int interval       : 5000
+    property bool isPlaying     : false // initial state
 
     iconImageSource : _root.isPlaying ? "qrc:/images/iPause" : "qrc:/images/iPlay"
     isDefault       : true
Index: sources/gui/qml/dialogs/NotificationDialog.qml
===================================================================
diff -u -r0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29 -r19acf57838bc97979052d626f3e05d46310b6335
--- sources/gui/qml/dialogs/NotificationDialog.qml	(.../NotificationDialog.qml)	(revision 0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29)
+++ sources/gui/qml/dialogs/NotificationDialog.qml	(.../NotificationDialog.qml)	(revision 19acf57838bc97979052d626f3e05d46310b6335)
@@ -44,7 +44,7 @@
 
     property bool  resumeVisible        : false
     property bool  rinsebackVisible     : false
-    property bool  temporaryBreakVisible: alarmID === 3   // TODO -- ONLY FOR DEMO - nned to update fw message and add
+    property bool  temporaryBreakVisible: false
     property bool  endVisible           : false
     property bool  okVisible            : false
     property bool  minVisible           : true
@@ -158,6 +158,11 @@
             interactive : false
             clip        : true
 
+            onCurrentIndexChanged: {
+                var item = model.get(_listView.currentIndex)
+                _root.figureImageSource = item.image
+            }
+
             delegate: Item { id: _delegateControl
                 width   : _listView.width
                 height  : Variables.instructionHeight
@@ -210,12 +215,7 @@
 
                 MouseArea {
                     anchors.fill: parent
-                    onClicked: {
-                        if (_listView.currentIndex !== index) {
-                            _listView.currentIndex = index
-                            _root.figureImageSource = model.image
-                        }
-                    }
+                    onClicked: _listView.currentIndex = index
                 }
             }
         }
Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -r0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29 -r19acf57838bc97979052d626f3e05d46310b6335
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 19acf57838bc97979052d626f3e05d46310b6335)
@@ -196,4 +196,15 @@
             }
         }
     }
+
+    Connections { target: vTreatmentAdjustmentUltrafiltrationState
+        function onAdjustmentTriggered              ( vValue ) {
+            if (vTreatmentAdjustmentUltrafiltrationState.adjustment_Accepted) {
+                _notification.text = ""
+            }
+            else {
+                _notification.text = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText
+            }
+        }
+    }
 }
Index: sources/gui/qml/pages/treatment/TreatmentSection.qml
===================================================================
diff -u -r6c3a4b048006ebd90c85cfa943d2b9615dc808f3 -r19acf57838bc97979052d626f3e05d46310b6335
--- sources/gui/qml/pages/treatment/TreatmentSection.qml	(.../TreatmentSection.qml)	(revision 6c3a4b048006ebd90c85cfa943d2b9615dc808f3)
+++ sources/gui/qml/pages/treatment/TreatmentSection.qml	(.../TreatmentSection.qml)	(revision 19acf57838bc97979052d626f3e05d46310b6335)
@@ -29,14 +29,18 @@
     signal editClicked()
     signal lockClicked()
     signal expandingClicked()
+    signal vitalsClicked()
+    signal pauseResumeClicked()
 
     color: Colors.treatmentSectionMain
     radius: 15
 
     TreatmentSectionHeader { id: _header
-            onEditClicked       : _root.editClicked()
-            onLockClicked       : _root.lockClicked()
-            onExpandingClicked  : _root.expandingClicked()
+        onEditClicked       : _root.editClicked()
+        onLockClicked       : _root.lockClicked()
+        onExpandingClicked  : _root.expandingClicked()
+        onVitalsClicked     : _root.vitalsClicked()
+        onPauseResumeClicked: _root.pauseResumeClicked()
     }
 
     ContentArea { id : _contentArea
Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
===================================================================
diff -u -r1286d74bd015276aab604808be2766136091c125 -r19acf57838bc97979052d626f3e05d46310b6335
--- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml	(.../TreatmentSectionHeader.qml)	(revision 1286d74bd015276aab604808be2766136091c125)
+++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml	(.../TreatmentSectionHeader.qml)	(revision 19acf57838bc97979052d626f3e05d46310b6335)
@@ -18,20 +18,26 @@
 
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/compounds"
 
 Rectangle { id: _root
-    property string title       : ""
-    property bool editEnabled   : true
-    property bool showLock      : false
-    property bool showEdit      : true
-    property bool showExpanding : false
+    property string title           : ""
+    property bool editEnabled       : true
+    property bool showLock          : false
+    property bool showEdit          : true
+    property bool showExpanding     : false
+    property bool showVitals        : false
+    property bool showPauseResume   : false
+    property bool isPaused          : true
 
     property int titleLeftMargin: Variables.defaultMargin * 2
     property bool setEditActive : true // set to disable edit no matter what
 
     signal editClicked()
     signal lockClicked()
     signal expandingClicked()
+    signal vitalsClicked()
+    signal pauseResumeClicked()
 
     color       : Colors.treatmentSectionHeader
     height      : Variables.contentHeight + (Variables.defaultMargin * 2)
@@ -69,8 +75,20 @@
             rightMargin     :  Variables.defaultMargin
         }
 
+        IconButton { id  : _pauseResume
+            visible         : showPauseResume
+            iconImageSource : _root.isPaused ? "qrc:/images/iPlay" : "qrc:/images/iPause"
+            isDefault       : true
+            onClicked       : _root.pauseResumeClicked()
+        }
+
+        IconButton {id : _vitals
+            visible         : showVitals
+
+            onClicked       : _root.vitalsClicked()
+        }
+
         ArrowButton {id : _expandingArrows
-            iconSize        : Variables.iconButtonSize
             visible         : showExpanding
             expandingArrow  : true
             onClicked       : _root.expandingClicked()
Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
===================================================================
diff -u -r5f6822550c1c8c6e1d3772269121205c478ed299 -r19acf57838bc97979052d626f3e05d46310b6335
--- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(.../TreatmentUltrafiltration.qml)	(revision 5f6822550c1c8c6e1d3772269121205c478ed299)
+++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(.../TreatmentUltrafiltration.qml)	(revision 19acf57838bc97979052d626f3e05d46310b6335)
@@ -45,9 +45,13 @@
     readonly property color statusColor        :    isUfCompleted   ? Colors.statusTextComplete :
                                                     paused          ? Colors.statusPaused       :
                                                     running         ? Colors.transparent        : Colors.transparent
+    header.showPauseResume          : true
+    header.isPaused                 : _root.paused
+    header.title                    : qsTr("Ultrafiltration") + " (" + qsTr("UF") + ")"
+    contentArea.anchors.topMargin   : Variables.defaultMargin
 
-    header.title: qsTr("Ultrafiltration") + " (" + qsTr("UF") + ")"
-    contentArea.anchors.topMargin: Variables.defaultMargin
+    onPauseResumeClicked: _root.paused ? vTreatmentAdjustmentUltrafiltrationState.doResume() :
+                                         vTreatmentAdjustmentUltrafiltrationState.doPause()
 
     contentItem: Row { id: _row
         spacing     : Variables.defaultMargin * 6