Index: denali.qrc
===================================================================
diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e
--- denali.qrc	(.../denali.qrc)	(revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e)
+++ denali.qrc	(.../denali.qrc)	(revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e)
@@ -85,5 +85,6 @@
         <file alias="TreatmentAdjustmentDuration.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationStart.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationPaused.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml</file>
+        <file alias="TreatmentAdjustmentUltrafiltrationEdit.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml</file>
     </qresource>
 </RCC>
Index: sources/gui/qml/components/ProgressBar.qml
===================================================================
diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e
--- sources/gui/qml/components/ProgressBar.qml	(.../ProgressBar.qml)	(revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e)
+++ sources/gui/qml/components/ProgressBar.qml	(.../ProgressBar.qml)	(revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e)
@@ -59,7 +59,7 @@
     }
 
     RangeMarker { id: _marker
-        z : 3 // ProgressBar marker should be on top of the all ProgressBars z order in the gui
+        z           : 2 // ProgressBar marker should be on top of the all ProgressBars z order in the gui
         anchors {
             left    : _progressRect.right
         }
Index: sources/gui/qml/components/ProgressBarEx.qml
===================================================================
diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e
--- sources/gui/qml/components/ProgressBarEx.qml	(.../ProgressBarEx.qml)	(revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e)
+++ sources/gui/qml/components/ProgressBarEx.qml	(.../ProgressBarEx.qml)	(revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e)
@@ -35,8 +35,8 @@
 
 
     ProgressRect { id: _progressRectEx
-        z       : 2 // ProgressBarEx z order in the gui
-                    // to be ordred amont the components of the parent (ProgressBar)
+        z       : 0 // ProgressBarEx z order in the gui
+                    // to be ordred among the components of the parent (ProgressBar)
         visible : value
 
         minimum : _root.minimum
Index: sources/gui/qml/globals/Fonts.qml
===================================================================
diff -u -r7045fd6002bdeb28e23a7af6a708a852d522ad12 -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e
--- sources/gui/qml/globals/Fonts.qml	(.../Fonts.qml)	(revision 7045fd6002bdeb28e23a7af6a708a852d522ad12)
+++ sources/gui/qml/globals/Fonts.qml	(.../Fonts.qml)	(revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e)
@@ -52,4 +52,12 @@
 
     readonly property int fontPixelDurationCurTime  : 89
     readonly property int fontPixelDurationAdjTime  : 28
+
+
+
+    readonly property int fontPixelUltrafiltrationAdjustmentPauseButton : 26
+    readonly property int fontPixelUltrafiltrationAdjustmentResumeButton: 30
+    readonly property int fontPixelUltrafiltrationAdjustmentEditButton  : 30
+    readonly property int fontPixelUltrafiltrationAdjustmentNextButton  : 26
+
 }
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e)
@@ -78,4 +78,5 @@
 
     readonly property int      durationResolution   : 15 // PRS346
 
+    readonly property int ultrafiltrationProgressbarWidth : 880
 }
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e)
@@ -90,11 +90,12 @@
             _treatmentAdjustmentUltrafiltrationPaused.open()
         }
     }
+
     TreatmentAdjustmentUltrafiltrationPaused { id: _treatmentAdjustmentUltrafiltrationPaused
         onCloseClicked          : close()
         onEditClicked           : {
-            // navigate to the Edit Dialog
             close()
+            _treatmentAdjustmentUltrafiltrationEdit.open()
         }
         onResumeClicked         : {
             // send HD resume and if accepted close()
@@ -103,4 +104,14 @@
         }
     }
 
+    TreatmentAdjustmentUltrafiltrationEdit { id: _treatmentAdjustmentUltrafiltrationEdit
+        onBackClicked           : {
+            close()
+            _treatmentAdjustmentUltrafiltrationPaused.open()
+        }
+        onNextClicked         : {
+            // Navigate to Ultrafiltration confirm dialog
+            close()
+        }
+    }
 }
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
===================================================================
diff -u
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(revision 0)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e)
@@ -0,0 +1,91 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright                                                       \n
+ *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,  \n
+ *          IN PART OR IN WHOLE,                                    \n
+ *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
+ *
+ * \file    TreatmentAdjustmentUltrafiltrationEdit.qml
+ * \date    2020/05/14
+ * \author  Behrouz NematiPour
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+// Project
+
+//  Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+
+/*!
+ * \brief   TreatmentAdjustmentUltrafiltrationEdit.qml is the screen
+ *          To adjust the treatment ultrafiltration
+ */
+TreatmentAdjustmentBase { id: _root
+
+    signal   nextClicked()
+
+    closeVisible    : false
+    confirmVisible  : false
+    backVisible     : true
+
+    titleText   : qsTr("ULTRAFILTRATION VOLUME") + "   " + qsTr("(mL)")
+    notification {
+        text: qsTr("Ultrafiltration is paused.")
+        imageSource: "qrc:/images/iPauseGray"
+    }
+
+    ProgressBarEx { id: _rangeProgressBar
+        width   : Variables.ultrafiltrationProgressbarWidth
+        height  : Variables.progressbarHeight
+        anchors {
+            top: parent.top
+            topMargin: 250
+            horizontalCenter: parent.horizontalCenter
+        }
+        minimum : 0
+        maximum : 8000
+        // TEST : it has to be bound to MeasUFVol to get the actual values from pumps
+        //        but since we have none in testing code bound to the refUFVal which
+        //        is the calculated/expected volume.
+        //// value   : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2);
+        value   : vTreatmentUltrafiltration.ultrafiltration_RefUFVol.toFixed(2);
+        valueEx : _adjustmentSlider.value
+    }
+
+    Slider { id: _adjustmentSlider
+        width   : Variables.ultrafiltrationProgressbarWidth / 2
+        height  : 2
+        anchors {
+            top: _rangeProgressBar.bottom
+            topMargin: 50
+            right: _rangeProgressBar.right
+        }
+        bgColor: "#0c2135"
+        minimum: 4000
+        maximum: 8000
+    }
+
+    TouchRect { id: _nextButton
+        width: 530
+        height: 95
+        anchors {
+            top: parent.top
+            topMargin: 460
+            horizontalCenter: parent.horizontalCenter
+        }
+
+        backgroundColor: Colors.backgroundButtonSelect
+
+        text  {
+            text: qsTr("NEXT")
+            font.weight: Font.DemiBold
+            font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentNextButton
+        }
+        onClicked: nextClicked()
+    }
+}
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
===================================================================
diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml	(.../TreatmentAdjustmentUltrafiltrationPaused.qml)	(revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml	(.../TreatmentAdjustmentUltrafiltrationPaused.qml)	(revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e)
@@ -23,7 +23,7 @@
 
 /*!
  * \brief   TreatmentAdjustmentUltrafiltrationStart.qml is the screen
- *          To adjust the treatment duration
+ *          To adjust the treatment ultrafiltration
  */
 TreatmentAdjustmentBase { id: _root
 
@@ -38,7 +38,7 @@
     }
 
     ProgressBarEx { id: _progressbarex
-        width   : 880
+        width   : Variables.ultrafiltrationProgressbarWidth
         height  : Variables.progressbarHeight
         anchors {
             top: parent.top
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
===================================================================
diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(.../TreatmentAdjustmentUltrafiltrationStart.qml)	(revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml	(.../TreatmentAdjustmentUltrafiltrationStart.qml)	(revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e)
@@ -23,7 +23,7 @@
 
 /*!
  * \brief   TreatmentAdjustmentUltrafiltrationStart.qml is the screen
- *          To adjust the treatment duration
+ *          To adjust the treatment ultrafiltration
  */
 TreatmentAdjustmentBase { id: _root
     signal pauseClicked()
@@ -32,7 +32,7 @@
     titleText   : qsTr("ULTRAFILTRATION VOLUME") + "   " + qsTr("(mL)")
 
     ProgressBarEx { id: _progressbarex
-        width   : 880
+        width   : Variables.ultrafiltrationProgressbarWidth
         height  : Variables.progressbarHeight
         anchors {
             top: parent.top