Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
===================================================================
diff -u -r923377d29fe730c0e2209386479a61b1e8ee1097 -re36852d9548379bd861d4b0838761d2aa5243dad
--- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision 923377d29fe730c0e2209386479a61b1e8ee1097)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision e36852d9548379bd861d4b0838761d2aa5243dad)
@@ -46,8 +46,7 @@
             title           : qsTr("Blood Flow")
             height          : _row.cellHeight
             width           : _row.cellWidth
-            value           : Variables.notSetVariable(vTreatmentSetPoint.bloodFlow) === "_" ?  Variables.notSetVariable(vTreatmentSetPoint.bloodFlow) :
-                                                                                                Variables.notSetVariable(vTreatmentSetPoint.bloodFlow).toFixed(0)
+            value           : Variables.notSetVariable(vTreatmentSetPoint.bloodFlow.toFixed(0))
             unitText        : Variables.unitTextFlowRate
             buttonsEnabled  : editEnabled
 
@@ -65,8 +64,8 @@
             buttonsEnabled  : editEnabled
             extraText       :   vTreatmentSetPoint.dialysateFlow === 0  ||
                                 vTDTreatmentStates.txIsolatedUf         ?   qsTr("OFF")  :
-                                ! vDDGenDialysate.isDialGood            ?   qsTr("Bypass") :
-                                                                            ""
+                              ! vDDGenDialysate.isDialGood              ?   qsTr("Bypass") :
+                                ""
             showButtons     : ! vTDTreatmentStates.txIsolatedUf
 
             onIncrement     : print(" increment dial flow")
@@ -78,8 +77,7 @@
             title           : qsTr("Dialysate Temp.")
             height          : _row.cellHeight
             width           : _row.cellWidth
-            value           : Variables.notSetVariable(vTreatmentSetPoint.dialysateTemp) === "_" ? Variables.notSetVariable(vTreatmentSetPoint.dialysateTemp) :
-                                                                                                   Variables.notSetVariable(vTreatmentSetPoint.dialysateTemp).toFixed(1)
+            value           : Variables.notSetVariable(vTreatmentSetPoint.dialysateTemp.toFixed(1))
             unitText        : Variables.unitTextTemperature
             buttonsEnabled  : editEnabled
             showButtons     : ! vTDTreatmentStates.txIsolatedUf
@@ -93,8 +91,7 @@
             title           : qsTr("Dialysate Cond.")
             height          : _row.cellHeight
             width           : _row.cellWidth
-            value           : Variables.notSetVariable(vDDConductivity.acidBicarbCondutivity2)  ? Variables.notSetVariable(vDDConductivity.acidBicarbCondutivity2) :
-                                                                                                  Variables.notSetVariable(vDDConductivity.acidBicarbCondutivity2).toFixed(2) // D29
+            value           : Variables.notSetVariable(vDDConductivity.acidBicarbCondutivity2.toFixed(2)) // D29
             unitText        : Variables.unitTextDialCond
             showButtons     : false
             dropShadowEnabled : false
Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml
===================================================================
diff -u -r923377d29fe730c0e2209386479a61b1e8ee1097 -re36852d9548379bd861d4b0838761d2aa5243dad
--- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml	(.../TreatmentFlowsComponent.qml)	(revision 923377d29fe730c0e2209386479a61b1e8ee1097)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml	(.../TreatmentFlowsComponent.qml)	(revision e36852d9548379bd861d4b0838761d2aa5243dad)
@@ -118,8 +118,6 @@
                 onClicked   : _root.decrement()
             }
         }
-
-        add: Transition { NumberAnimation { properties: "opacity"; from: 0; to: 1; duration: Variables.defaultAnimationDuration } }
     }
 
     layer.enabled   : _root.dropShadowEnabled && _root.showButtons
Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml
===================================================================
diff -u -r923377d29fe730c0e2209386479a61b1e8ee1097 -re36852d9548379bd861d4b0838761d2aa5243dad
--- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml	(.../TreatmentPressures.qml)	(revision 923377d29fe730c0e2209386479a61b1e8ee1097)
+++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml	(.../TreatmentPressures.qml)	(revision e36852d9548379bd861d4b0838761d2aa5243dad)
@@ -31,8 +31,8 @@
     property int    arterialMaximum     : vTreatmentRanges.arterialPressureMonitorMax
     property int    venousMinimum       : vTreatmentRanges.venousPressureMonitorMin
     property int    venousMaximum       : vTreatmentRanges.venousPressureMonitorMax
-    property int    tmpMinimum          : vTreatmentRanges.TrancembrncPressureMonitorMin
-    property int    tmpMaximum          : vTreatmentRanges.TrancembrncPressureMonitorMax
+    property int    tmpMinimum          : vTreatmentRanges.trancembrncPressureMonitorMin
+    property int    tmpMaximum          : vTreatmentRanges.trancembrncPressureMonitorMax
 
     property int    arterialLowerBound  : vTreatmentPressureOcclusion.arterialMin
     property int    arterialUpperBound  : vTreatmentPressureOcclusion.arterialMax
Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
===================================================================
diff -u -r923377d29fe730c0e2209386479a61b1e8ee1097 -re36852d9548379bd861d4b0838761d2aa5243dad
--- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(.../TreatmentUltrafiltration.qml)	(revision 923377d29fe730c0e2209386479a61b1e8ee1097)
+++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(.../TreatmentUltrafiltration.qml)	(revision e36852d9548379bd861d4b0838761d2aa5243dad)
@@ -47,12 +47,12 @@
                                         isTreatmentPaused || isUFPaused ?   Colors.mainTreatmentOrange  :
                                                                             Colors.mainTreatmentOrange
 
-    property string ufVolumeDescriptionText :   isTreatmentPaused ||
-                                                vTDTreatmentStates.txDialysis   ?   ""                  :
-                                                isUFRunning ||
-                                                isUFPaused                      ?   qsTr("Isolated UF") :
-                                                                                    ""
+    property string ufVolumeDescriptionText :   isTreatmentPaused || vTDTreatmentStates.txDialysis   ?  ""                  :
+                                                isUFRunning       || isUFPaused                      ?  qsTr("Isolated UF") :
+                                                                                                        ""
 
+    property string ufVolumeDescriptionText :  "" // TODO: add logic for qsTr("Isolated UF") and qsTr("Isolated + Target UF")
+
     header.title: qsTr("Ultrafiltration") + " (" + qsTr("UF") + ")"
     contentArea.anchors.topMargin: Variables.defaultMargin
 
Index: sources/view/hd/data/VTreatmentRanges.cpp
===================================================================
diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -re36852d9548379bd861d4b0838761d2aa5243dad
--- sources/view/hd/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9)
+++ sources/view/hd/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision e36852d9548379bd861d4b0838761d2aa5243dad)
@@ -112,14 +112,15 @@
     FROMVARIANT_WITHRETURN              ( dialysateTempMax                  , "Dialysate Temperature"                   , "Dialysate_Temperature_Max"           , Float , isConfigsOk );
     FROMVARIANT_WITHRETURN              ( dialysateTempRes                  , "Dialysate Temperature"                   , "Dialysate_Temperature_Res"           , Float , isConfigsOk );
 
-    FROMVARIANT_WITHRETURN              ( TrancembrncPressureLimitWindowDef , "Trancememberance Pressure Ranges"        , "Trancememberance_Adjust_Window_Def"  , Int   , isConfigsOk );
-    FROMVARIANT_WITHRETURN              ( TrancembrncPressureLimitWindowMin , "Trancememberance Pressure Ranges"        , "Trancememberance_Adjust_Window_Min"  , Int   , isConfigsOk );
-    FROMVARIANT_WITHRETURN              ( TrancembrncPressureLimitWindowMax , "Trancememberance Pressure Ranges"        , "Trancememberance_Adjust_Window_Max"  , Int   , isConfigsOk );
-    FROMVARIANT_WITHRETURN              ( TrancembrncPressureLimitWindowRes , "Trancememberance Pressure Ranges"        , "Trancememberance_Adjust_Window_Res"  , Int   , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( trancembrncPressureLimitWindowDef , "Trancememberance Pressure Ranges"        , "Trancememberance_Adjust_Window_Def"  , Int   , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( trancembrncPressureLimitWindowDef , "Trancememberance Pressure Ranges"        , "Trancememberance_Adjust_Window_Def"  , Int   , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( trancembrncPressureLimitWindowMin , "Trancememberance Pressure Ranges"        , "Trancememberance_Adjust_Window_Min"  , Int   , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( trancembrncPressureLimitWindowMax , "Trancememberance Pressure Ranges"        , "Trancememberance_Adjust_Window_Max"  , Int   , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( trancembrncPressureLimitWindowRes , "Trancememberance Pressure Ranges"        , "Trancememberance_Adjust_Window_Res"  , Int   , isConfigsOk );
 
-    FROMVARIANT_WITHRETURN              ( TrancembrncPressureMonitorMin     , "Trancememberance Pressure Ranges"        , "Trancememberance_Monitor_Min"        , Int   , isConfigsOk );
-    FROMVARIANT_WITHRETURN              ( TrancembrncPressureMonitorMax     , "Trancememberance Pressure Ranges"        , "Trancememberance_Monitor_Max"        , Int   , isConfigsOk );
-    FROMVARIANT_WITHRETURN              ( TrancembrncPressureMonitorRes     , "Trancememberance Pressure Ranges"        , "Trancememberance_Monitor_Res"        , Int   , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( trancembrncPressureMonitorMin     , "Trancememberance Pressure Ranges"        , "Trancememberance_Monitor_Min"        , Int   , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( trancembrncPressureMonitorMax     , "Trancememberance Pressure Ranges"        , "Trancememberance_Monitor_Max"        , Int   , isConfigsOk );
+    FROMVARIANT_WITHRETURN              ( trancembrncPressureMonitorRes     , "Trancememberance Pressure Ranges"        , "Trancememberance_Monitor_Res"        , Int   , isConfigsOk );
 
     FROMVARIANT_WITHRETURN              ( arterialPressureLimitWindowDef    , "Arterial Blood Pressure Ranges"          , "Arterial_Adjust_Window_Def"          , Int   , isConfigsOk );
     FROMVARIANT_WITHRETURN              ( arterialPressureLimitWindowMin    , "Arterial Blood Pressure Ranges"          , "Arterial_Adjust_Window_Min"          , Int   , isConfigsOk );
Index: sources/view/hd/data/VTreatmentRanges.h
===================================================================
diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -re36852d9548379bd861d4b0838761d2aa5243dad
--- sources/view/hd/data/VTreatmentRanges.h	(.../VTreatmentRanges.h)	(revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9)
+++ sources/view/hd/data/VTreatmentRanges.h	(.../VTreatmentRanges.h)	(revision e36852d9548379bd861d4b0838761d2aa5243dad)
@@ -59,15 +59,15 @@
     READONLY( QStringList   , dialyzerTypeOptions                           ,{})
 
     RANGESET( float         , dialysateTemp                                 , 0)
-    RANGESET( qint32        , TrancembrncPressureLimitWindow                , 0)
+    RANGESET( qint32        , trancembrncPressureLimitWindow                , 0)
     RANGESET( qint32        , arterialPressureLimitWindow                   , 0)
     RANGESET( qint32        , venousPressureLimitWindow                     , 0)
     RANGESET( qint32        , venousPressureLimitAsymtrc                    , 0)
     RANGESET( quint32       , bloodPressureMeasureInterval                  , 0)
     RANGESET( quint32       , rinsebackFlowRate                             , 0)
 
     // monitoring ranges
-    RANGESET( qint32        , TrancembrncPressureMonitor                    , 0)
+    RANGESET( qint32        , trancembrncPressureMonitor                    , 0)
     RANGESET( qint32        , arterialPressureMonitor                       , 0)
     RANGESET( qint32        , venousPressureMonitor                         , 0)