Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -rcf3ef3656c06ade00b6bc6c09e8e0f858ee1af24 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision cf3ef3656c06ade00b6bc6c09e8e0f858ee1af24)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -31,67 +31,69 @@
     property int minimum        : 0
     property int maximum        : vTreatmentTime.time_Total
     property int progressValue  : vTreatmentTime.time_Elapsed
-    property int timeTextValue  : 30000//vTreatmentTime.time_Remaining
+    property int timeTextValue  : vTreatmentTime.time_Remaining
 
     property bool isRunning     : vHDTreatmentStates.txDialysis &&
                                   !( vHDTreatmentStates.sbWaitPump || vHDTreatmentStates.sbRunning )
 
+    color   : "transparent"
+    width   : _circle.width
+    height  : _circle.height
+
     signal clicked()
 
-    color: "transparent"
-    width: _circle.width
-    height: _circle.height
-
     ProgressCircle { id: _circle
-        objectName: "circle"
+        objectName  : "circle"
+        minimum             : _root.minimum
+        maximum             : _root.maximum
 
-        minimum: 0//_root.minimum
-        maximum: 60//_root.maximum
-
-        anchors.fill  : parent
-        value: 45//_root.progressValue
-        thickness   : 35
-        circle.shadow.color: Colors.mainTreatmentLighterBlue
-        circle.fillColor: Colors.mainTreatmentDarkerBlue
-        circle.showGradient: _root.isRunning
-        circle.runAnimation: _root.isRunning
+        anchors.fill        : parent
+        value               : _root.progressValue
+        thickness           : 35
+        circle.shadow.color : Colors.mainTreatmentLighterBlue
+        circle.fillColor    : Colors.mainTreatmentDarkerBlue
+        circle.showGradient : _root.isRunning
+        circle.runAnimation : _root.isRunning
         circle.startGradientColor: "#2A5A93"
-        color: _root.isRunning ? Colors.borderButton : "#9B864E"
+        color: _root.isRunning ? Colors.borderButton :
+                                 "#9B864E"
     }
 
     TimeText { id: _timeText
         objectName: "timeText"
 
-        anchors.centerIn  : parent
-        anchors.horizontalCenterOffset: -Variables.defaultMargin
-        seconds : _root.timeTextValue
-        textWeight: Font.Normal
-        secsPixelSize: 35
-        secondsLeftMargin: 10
+        anchors {
+            centerIn                : parent
+            horizontalCenterOffset  : -Variables.defaultMargin
+        }
+        seconds                     : _root.timeTextValue
+        textWeight              : Font.Normal
+        secsPixelSize           : 35
+        secondsLeftMargin       : 10
     }
 
     Item { id: _timeTitleRect
         objectName: "timeTextRect"
 
         anchors {
             horizontalCenter: _root.horizontalCenter
-            bottom: _timeText.top
-            bottomMargin: Variables.defaultMargin * 2
+            bottom          : _timeText.top
+            bottomMargin    : Variables.defaultMargin * 2
         }
 
-        width   : _root.width
+        width               : _root.width
 
         Text { id: _timeTitle
-            objectName: "timeTitle"
-            text: qsTr("Time Remaining")
+            objectName  : "timeTitle"
+            text        : qsTr("Time Remaining")
 
             anchors {
                 horizontalCenter: parent.horizontalCenter
             }
 
-            font.pixelSize: 26
-            font.weight: Font.Normal
-            color: Colors.textMain
+            font.pixelSize  : 26
+            font.weight     : Font.Normal
+            color           : Colors.textMain
         }
 
         TreatmentSectionIcon { id  : _editTimeIcon
@@ -103,45 +105,42 @@
             }
             iconSize            : 30
             iconImage.source    : "qrc:/images/iEdit"
-            onClicked           : _root.isRunning = ! _root.isRunning // REMOVE Testing***********8
-//            onClicked           : _root.clicked()
+            onClicked           : _root.clicked()
         }
     }
 
     NotificationBarSmall { id: _notification
         objectName: "notification"
 
         anchors {
-            left: _timeTitleRect.left
-            leftMargin: Variables.defaultMargin
-            top: _timeTitleRect.bottom
-            topMargin: Variables.defaultMargin * 2
+            left        : _timeTitleRect.left
+            leftMargin  : Variables.defaultMargin
+            top         : _timeTitleRect.bottom
+            topMargin   : Variables.defaultMargin * 2
         }
 
-        visible : ! _root.isRunning
-        height  : 25
-        color: "transparent"
-        image.width: 25
-        image.height: 25
+        visible                 : ! _root.isRunning
+        height                  : 25
+        color                   : "transparent"
+        image.width             : 25
+        image.height            : 25
         image.anchors.topMargin: 4
-
-        imageSource : "qrc:/images/iPauseOrange"
-        text        : qsTr("Treatment Paused")
-        textColor   : "#FFB836"
-        textfontSize: 26
-        textfontWeight: Font.Medium
+        imageSource             : "qrc:/images/iPauseOrange"
+        text                    : qsTr("Treatment Paused")
+        textColor               : "#FFB836"
+        textfontSize            : 26
+        textfontWeight          : Font.Medium
     }
 
     layer.enabled: true
-    layer.effect: DropShadow {
-        id: _dropShadow
+    layer.effect: DropShadow { id: _dropShadow
         horizontalOffset: 0
-        verticalOffset: 5
-        radius: 3.0
-        samples: 7
-        color: "#50000000"
-        source: _root
-        anchors.fill: _root
+        verticalOffset  : 5
+        radius          : 3.0
+        samples         : 7
+        color           : "#50000000"
+        source          : _root
+        anchors.fill    : _root
     }
 }