Index: main.cpp
===================================================================
diff -u -r07d06c2d00ca6f4d7a8246a3405e77961ff393dc -rbd12a330df798024c3de30f727058d971dfc2cbe
--- main.cpp	(.../main.cpp)	(revision 07d06c2d00ca6f4d7a8246a3405e77961ff393dc)
+++ main.cpp	(.../main.cpp)	(revision bd12a330df798024c3de30f727058d971dfc2cbe)
@@ -369,7 +369,7 @@
             gActiveCANBus = value;
         }
     }
-    qDebug() << "App can" << gActiveCANBus << gEnableDryDemo;
+    //DEBUG: qDebug() << "App can" << gActiveCANBus << gEnableDryDemo;
     if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = true;
     bool ok = false;
 
Index: sources/gui/qml/components/SliderCreateTreatment.qml
===================================================================
diff -u -r40c81d8364424610feeffeb5ac30e990105c8c00 -rbd12a330df798024c3de30f727058d971dfc2cbe
--- sources/gui/qml/components/SliderCreateTreatment.qml	(.../SliderCreateTreatment.qml)	(revision 40c81d8364424610feeffeb5ac30e990105c8c00)
+++ sources/gui/qml/components/SliderCreateTreatment.qml	(.../SliderCreateTreatment.qml)	(revision bd12a330df798024c3de30f727058d971dfc2cbe)
@@ -60,9 +60,9 @@
         reset(defaultValue)
         if ( toggleSwich ) {
             toggleSwich.checked = false
-            toggleSwich.active  = _GuiView.dryDemoMode ? true : false
+            toggleSwich.active  = _GuiView.dryDemoMode
         }
-        _root.active = _GuiView.dryDemoMode ? true : false
+        _root.active = _GuiView.dryDemoMode
     }
 
     function reset(vValue) {
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r40c81d8364424610feeffeb5ac30e990105c8c00 -rbd12a330df798024c3de30f727058d971dfc2cbe
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 40c81d8364424610feeffeb5ac30e990105c8c00)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision bd12a330df798024c3de30f727058d971dfc2cbe)
@@ -409,7 +409,7 @@
     PowerItem           { id: _powerItem        ;   z: 997 }
     ConfirmDialog       { id: _confirmDialog    ;   z: 998 }
     DiagnosticsDialog   { id: _diagnosticsDialog;   z: 999 }
-    DryDemoDialog       { id: _dryDemoDialog    ;   z: 999 }
+    DryDemoDialog       { id: _dryDemoDialog    ;   z: 999 } // Same z order because diagnostics is not used in dryDemo
 
     // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
     //       then cannot be anchored.
Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml
===================================================================
diff -u -rf6111d1b41ad5103eb561c0159c17d694642b693 -rbd12a330df798024c3de30f727058d971dfc2cbe
--- sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml	(.../PreTreatmentUltrafiltration.qml)	(revision f6111d1b41ad5103eb561c0159c17d694642b693)
+++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml	(.../PreTreatmentUltrafiltration.qml)	(revision bd12a330df798024c3de30f727058d971dfc2cbe)
@@ -33,6 +33,10 @@
 
     header.confirmEnabled: _volumeSlider.isActive
     onVisibleChanged: {
+        /*
+        It is only for the dry-demo due to its independent flow.
+        Otherwise, won't needed in the normal designed user-flow.
+        */
         clear()
     }
 
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r07d06c2d00ca6f4d7a8246a3405e77961ff393dc -rbd12a330df798024c3de30f727058d971dfc2cbe
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 07d06c2d00ca6f4d7a8246a3405e77961ff393dc)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision bd12a330df798024c3de30f727058d971dfc2cbe)
@@ -29,6 +29,9 @@
  */
 PreTreatmentBase { id: _root
     objectName: "_PreTreatmentCreate" // SquishQt testability
+    readonly property int dryDemoBloodFlowRateMLPMDef     : 400
+    readonly property int dryDemoDialysateFlowRateMLPMDef : 600
+    readonly property int dryDemoTreatmentDurationMinDef  : 240
 
     header.confirmEnabled:
         _bloodFlowRate          .active      && _bloodFlowRate          .          valid &&
@@ -134,7 +137,7 @@
         anchors.rightMargin : Variables.minVGap
     }
 
-    Flickable { id: _flickable
+    Flickable { id: _flickable       
         objectName: "TreatmentCreateFlickable"
         clip: true
         anchors {
@@ -170,7 +173,7 @@
                 minimum     : vTreatmentRanges.bloodFlowRateMin
                 maximum     : vTreatmentRanges.bloodFlowRateMax
                 step        : vTreatmentRanges.bloodFlowRateRes
-                defaultValue: _GuiView.dryDemoMode ? 400 : vTreatmentRanges.bloodFlowRateDef
+                defaultValue: _GuiView.dryDemoMode ? _root.dryDemoBloodFlowRateMLPMDef : vTreatmentRanges.bloodFlowRateDef
                 valid       : !vTreatmentCreate.bloodFlowRateRejectReason
                 onValueChanged : {
                     // Reset the valid state to allow repositioning to the next invalid parameter
@@ -189,7 +192,7 @@
                 minimum     : vTreatmentRanges.dialysateFlowRateMin
                 maximum     : vTreatmentRanges.dialysateFlowRateMax
                 step        : vTreatmentRanges.dialysateFlowRateRes
-                defaultValue: _GuiView.dryDemoMode ? 600 : vTreatmentRanges.dialysateFlowRateDef
+                defaultValue: _GuiView.dryDemoMode ? _root.dryDemoDialysateFlowRateMLPMDef : vTreatmentRanges.dialysateFlowRateDef
                 valid       : !vTreatmentCreate.dialysateFlowRateRejectReason                  
                 onValueChanged : {
                     // Reset the valid state to allow repositioning to the next invalid parameter
@@ -208,7 +211,7 @@
                 minimum     : vTreatmentRanges.treatmentDurationMin
                 maximum     : vTreatmentRanges.treatmentDurationMax
                 step        : vTreatmentRanges.treatmentDurationRes
-                defaultValue: _GuiView.dryDemoMode ? 240 : vTreatmentRanges.treatmentDurationDef
+                defaultValue: _GuiView.dryDemoMode ? _root.dryDemoTreatmentDurationMinDef : vTreatmentRanges.treatmentDurationDef
                 valid       : !vTreatmentCreate.treatmentDurationRejectReason
                 onValueChanged: {
                     // Reset the valid state to allow repositioning to the next invalid parameter
Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
===================================================================
diff -u -ref73f9495cfa958bde5ba4208fe665ab8c612af7 -rbd12a330df798024c3de30f727058d971dfc2cbe
--- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision ef73f9495cfa958bde5ba4208fe665ab8c612af7)
+++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision bd12a330df798024c3de30f727058d971dfc2cbe)
@@ -26,9 +26,12 @@
  * \brief   Treatment Screen Vitals section
  */
 TouchArea { id: _root
-    readonly property string bloodSDSeparator: " / "    
+    readonly property string bloodSDSeparator     : " / "
+    readonly property int dryDemoSystolicMMHGDef  : 140
+    readonly property int dryDemoDiastolicMMHGDef : 90
+    readonly property int dryDemoHearRateBPMDef   : 80
 
-    readonly property string systolic  : Variables.notSetVariable(vTreatmentVitals.systolic, 2)
+    readonly property string systolic  : Variables.notSetVariable(vTreatmentVitals.systolic,  2)
     readonly property string diastolic : Variables.notSetVariable(vTreatmentVitals.diastolic, 2)
     readonly property string heartRate : Variables.notSetVariable(vTreatmentVitals.heartRate, 2)
 
@@ -44,15 +47,15 @@
             labelFont.pixelSize: Fonts.fontPixelVitals
             labelFont.weight: Font.ExtraLight
             labelAutoSize: true
-            label: (_GuiView.dryDemoMode && systolic == "__" ? 140 : systolic) + bloodSDSeparator + (_GuiView.dryDemoMode && diastolic == "__" ? 90 : diastolic)
+            label: (_GuiView.dryDemoMode && systolic == "__" ? _root.dryDemoSystolicMMHGDef : systolic) + bloodSDSeparator + (_GuiView.dryDemoMode && diastolic == "__" ? _root.dryDemoDiastolicMMHGDef : diastolic)
             extra: Variables.unitTextBloodPressure
         }
         TextRect { id: _heartBeat
             labelHeight: 40
             labelFont.pixelSize: Fonts.fontPixelVitals
             labelFont.weight: Font.ExtraLight
             labelAutoSize: true
-            label: (_GuiView.dryDemoMode && heartRate == "__" ? 80 : heartRate)
+            label: (_GuiView.dryDemoMode && heartRate == "__" ? _root.dryDemoHearRateBPMDef : heartRate)
             extra: Variables.unitTextHeartBeat
         }
     }
Index: sources/view/confirm/VConfirm.cpp
===================================================================
diff -u -r9000da1a6517e4a81a82d9d9a4b671ee4178360b -rbd12a330df798024c3de30f727058d971dfc2cbe
--- sources/view/confirm/VConfirm.cpp	(.../VConfirm.cpp)	(revision 9000da1a6517e4a81a82d9d9a4b671ee4178360b)
+++ sources/view/confirm/VConfirm.cpp	(.../VConfirm.cpp)	(revision bd12a330df798024c3de30f727058d971dfc2cbe)
@@ -99,7 +99,7 @@
    };
 
    DuetConfirmUIrData data;
-   data.mId        =  DRY_DEMO_COMMAND;
+   data.mId        = DRY_DEMO_COMMAND;
    data.mConfirm   = vCommandID;
    emit didAdjustment(data);
 }
Index: sources/view/confirm/VConfirm.h
===================================================================
diff -u -r9000da1a6517e4a81a82d9d9a4b671ee4178360b -rbd12a330df798024c3de30f727058d971dfc2cbe
--- sources/view/confirm/VConfirm.h	(.../VConfirm.h)	(revision 9000da1a6517e4a81a82d9d9a4b671ee4178360b)
+++ sources/view/confirm/VConfirm.h	(.../VConfirm.h)	(revision bd12a330df798024c3de30f727058d971dfc2cbe)
@@ -93,8 +93,8 @@
     VIEW_DEC_SLOT   (SettingsData          )
 
 public slots:
-    void doConfirm          (bool vConfirm);
-    void sendDryDemoCommand (quint32 vCommandID);
+    void doConfirm          (bool    vConfirm   );
+    void sendDryDemoCommand (quint32 vCommandID );
 
 signals:
     /*!