Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml
===================================================================
diff -u -r04892d957c8f85eba1dc0550c2c9b01eef86efe9 -rabe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9
--- sources/gui/qml/pages/treatment/TreatmentHDF.qml	(.../TreatmentHDF.qml)	(revision 04892d957c8f85eba1dc0550c2c9b01eef86efe9)
+++ sources/gui/qml/pages/treatment/TreatmentHDF.qml	(.../TreatmentHDF.qml)	(revision abe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9)
@@ -108,8 +108,8 @@
             height          : _column.cellHeight
             statusColor     : _root.statusColor()
 
-            onPauseResumeClicked    : vTreatmentHDF.hdfState === TreatmentHDFComponent.Paused ? vTreatmentAdjustmentHDFState.doResume() :
-                                                                                                vTreatmentAdjustmentHDFState.doPause()
+            onPauseResumeClicked    : vTreatmentHDF.hdfState === TreatmentHDF.Paused ?  vTreatmentAdjustmentHDFState.doResume() :
+                                                                                        vTreatmentAdjustmentHDFState.doPause()
 
             onEditClicked   :  _root.treatmentHDFEditClicked()
         }
Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml
===================================================================
diff -u -rde738ed372de968283937468795bdf6318c52e5a -rabe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9
--- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(.../TreatmentHDFComponent.qml)	(revision de738ed372de968283937468795bdf6318c52e5a)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml	(.../TreatmentHDFComponent.qml)	(revision abe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9)
@@ -127,7 +127,7 @@
                 minimum         : 0
                 maximum         : _root.prescribedSubstitutionVal.toFixed(Variables.substitutionPrecision)
                 value           : _root.substitutionValue.toFixed(Variables.substitutionPrecision)
-                valueEx         : _root.estimatedSubstitutionVal.toFixed(Variables.substitutionPrecision)
+                valueEx         : _root.volumeDeviation ? _root.estimatedSubstitutionVal.toFixed(Variables.substitutionPrecision) : 0
 
                 unitText        : Variables.unitVolume
                 color           : vTreatmentHDF.hdfState === TreatmentHDF.Paused ? Colors.pauseColor : Colors.progressBarUltrafiltration
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r98f1043b23038c234374c04416e538cd6a749df0 -rabe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 98f1043b23038c234374c04416e538cd6a749df0)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision abe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9)
@@ -76,7 +76,7 @@
     QString _tdSerialNumber = "";
 
     VALUESET(quint32    , treatmentModality                             , 0)
-    VALUESET(quint32    , hdfTreatmentMode                              , 0)
+    VALUESET(quint32    , hdfTreatmentMode                              , 1) // Default - Post Dilution
     VALUESET(quint32    , bloodFlowRate                                 , 0)
     VALUESET(quint32    , dialysateFlowRate                             , 0)
     VALUESET(quint32    , treatmentDuration                             , 0)
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r54b9a7699a46c0fde39b4d1a20b9f362bab435af -rabe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 54b9a7699a46c0fde39b4d1a20b9f362bab435af)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision abe8e7cfe31d4ac42a9d85f8e5d93fa809025ea9)
@@ -68,11 +68,11 @@
     ENUM_CHECK_O( GuiSalineStates, vData.mSalineState                                               ) {
     ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                                           )
     ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE                            )
-    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE                             )
+    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE                                    )
     ENUM_CHECK_C( GuiSalineStates, NUM_OF_FLUID_BOLUS_STATES                                        ) }
     ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                   , sbIdle                );
     ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE    , sbWaitPump            );
-    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE     , sbRunning             );
+    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE            , sbRunning             );
 
     // Heparin States
     _heparin                = false;