Index: denali.pro.user
===================================================================
diff -u -r6233e005c77ee0aa10e80c02254a21f2042b840b -rf0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957
--- denali.pro.user	(.../denali.pro.user)	(revision 6233e005c77ee0aa10e80c02254a21f2042b840b)
+++ denali.pro.user	(.../denali.pro.user)	(revision f0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2021-06-25T17:30:03. -->
+<!-- Written by QtCreator 4.10.0, 2021-06-28T14:47:41. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -1481,7 +1481,7 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">denali</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro</value>
-    <value type="QString" key="RunConfiguration.Arguments">--disable-timeout</value>
+    <value type="QString" key="RunConfiguration.Arguments">--disable-timeout --logOut</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
Index: sources/gui/qml/components/TimeText.qml
===================================================================
diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -rf0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957
--- sources/gui/qml/components/TimeText.qml	(.../TimeText.qml)	(revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617)
+++ sources/gui/qml/components/TimeText.qml	(.../TimeText.qml)	(revision f0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957)
@@ -40,7 +40,7 @@
 
     readonly property string time   : _private.time
 
-    color : "transparent"
+    color : Colors.transparent
     width : _hourText.contentWidth + _timeSeparator.contentWidth + _minuteText.contentWidth
     height: _timeSeparator.height
 
Index: sources/gui/qml/compounds/CheckListView.qml
===================================================================
diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -rf0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957
--- sources/gui/qml/compounds/CheckListView.qml	(.../CheckListView.qml)	(revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6)
+++ sources/gui/qml/compounds/CheckListView.qml	(.../CheckListView.qml)	(revision f0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957)
@@ -35,6 +35,9 @@
     property int    delegateWidth   : Variables.checkListViewItemWidth
     property int    delegateHeight  : Variables.checkListViewItemHeight
 
+    property bool   timeVisible     : false
+    property int    timeSeconds     : 0
+
     function resetItems() {
         if ( visible ) {
             for (let i = 0; i < _listView.count; i++) {
@@ -56,7 +59,6 @@
     Column {
         anchors.centerIn: _root
         Repeater { id: _listView
-
             model   : _root.stepNames
             delegate: Item { id: _delegate
                 property bool stepStart   : false
@@ -72,7 +74,7 @@
                     color   : Colors.textMain
                     font.pixelSize: Fonts.fontPixelStateListText
                 }
-                Line {
+                Line { id: _separatorLine
                     length          : _delegate.width + 2 * linePad
                     thickness       : 2
                     anchors {
@@ -88,6 +90,15 @@
                     visible : _delegate.stepStart
                     done    : _delegate.stepDone
                 }
+                TimeText { id: _timeText
+                    anchors.verticalCenter  : _stepText.verticalCenter
+                    anchors.left            : _separatorLine.right
+                    anchors.leftMargin      : Variables.minVGap
+                    seconds                 : _root.timeSeconds * 60
+                    secondsVisible          : false
+                    textPixelSize           : Fonts.fontPixelStateListText
+                    visible                 : _root.timeVisible && _delegate.stepStart && ! _delegate.stepDone
+                }
             }
         }
     }
Index: sources/gui/qml/pages/TreatmentFlowBase.qml
===================================================================
diff -u -rea616a4cf7cfe191c33e66119cd5a71b5772192a -rf0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957
--- sources/gui/qml/pages/TreatmentFlowBase.qml	(.../TreatmentFlowBase.qml)	(revision ea616a4cf7cfe191c33e66119cd5a71b5772192a)
+++ sources/gui/qml/pages/TreatmentFlowBase.qml	(.../TreatmentFlowBase.qml)	(revision f0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957)
@@ -50,7 +50,11 @@
     property bool   hasCheckList            : false
     readonly property alias checkList       : _checkListLoader.item
     property var    checkListStepNames      : []
-    property int    checkListCompleteMargin :  50
+    property int    checkListCompleteMargin : 50
+    property bool   checkListTimeVisible    : false
+    property int    checkListTimeSeconds    : 0
+
+
     property string completeText            : ""
 
     property bool   isComplete              : false
@@ -139,6 +143,8 @@
             completeText    : _root.completeText
             stepNames       : _root.checkListStepNames
             completeMargin  : _root.checkListCompleteMargin
+            timeVisible     : _root.checkListTimeVisible
+            timeSeconds     : _root.checkListTimeSeconds
         }
     }
 
Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r615da996f40180040439b2a2fba22e8f24920336 -rf0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 615da996f40180040439b2a2fba22e8f24920336)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision f0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957)
@@ -78,15 +78,12 @@
         objectName              : "_disinfectFlush"
         header.stepNames        : [ _root.disinfectTitle ,  _root.flushTitle ]
         title.text              :                           _root.flushTitle
-        hasTimeCircle           : true
-        timeCircleMinimum       : 0
-        timeCircleMaximum       : vDisinfectDGData.flushTimeTotal
-        timeCircleProgressValue : vDisinfectDGData.flushTimeElapsed
-        timeCircleTimeTextValue : vDisinfectDGData.flushTimeRemaining * 60
 
         hasCheckList            : true
         isComplete              : vDisinfectStates.flushComplete
         completeText            : qsTr("Water Flush Complete!")
+        checkListTimeVisible    : vDisinfectDGData.flushTimeTotal
+        checkListTimeSeconds    : vDisinfectDGData.flushTimeRemaining
         checkListStepNames      : [
             qsTr("Drain Device"         ),
             qsTr("Flush Reservoirs"     ),
@@ -99,15 +96,12 @@
         objectName              : "_disinfectHeat"
         header.stepNames        : [ _root.disinfectTitle ,  _root.heatTitle ]
         title.text              :                           _root.heatTitle
-        hasTimeCircle           : false
-        timeCircleMinimum       : 0
-        timeCircleMaximum       : vDisinfectDGData.heatTimeTotal
-        timeCircleProgressValue : vDisinfectDGData.heatTimeElapsed
-        timeCircleTimeTextValue : vDisinfectDGData.heatTimeRemaining * 60
 
         hasCheckList            : true
         isComplete              : vDisinfectStates.heatComplete
         completeText            : qsTr("Heat Disinfection Complete!")
+        checkListTimeVisible    : vDisinfectDGData.heatTimeTotal
+        checkListTimeSeconds    : vDisinfectDGData.heatTimeRemaining
         checkListStepNames      : [
             qsTr("Flush Before Disinfect"   ),
             qsTr("Heat Up Water"            ),
@@ -132,15 +126,12 @@
         objectName              : "_disinfectChemicalProgress"
         header.stepNames        : [ _root.disinfectTitle ,  _root.chemicalTitle ]
         title.text              :                           _root.chemicalTitle
-        hasTimeCircle           : true
-        timeCircleMinimum       : 0
-        timeCircleMaximum       : vDisinfectDGData.chemicalTimeTotal
-        timeCircleProgressValue : vDisinfectDGData.chemicalTimeElapsed
-        timeCircleTimeTextValue : vDisinfectDGData.chemicalTimeRemaining * 60
 
         hasCheckList            : true
         isComplete              : vDisinfectStates.chemicalComplete
         completeText            : qsTr("Chemical Disinfection Complete!")
+        checkListTimeVisible    : vDisinfectDGData.chemicalTimeTotal
+        checkListTimeSeconds    : vDisinfectDGData.chemicalTimeRemaining
         checkListStepNames      : [
             qsTr("Flush Before Disinfect"   ),
             qsTr("Mix water And Acid"       ),