Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r68757118f0b5dc5d831f8330ff3fec40dc461aa9
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9)
@@ -26,88 +26,105 @@
  * \brief   Treatment Screen Treatment Time Remaining section
  */
 Rectangle { id: _root
-    objectName: "TreatmentTime"
     property int minimum        : 0
     property int maximum        : vTreatmentTime.time_Total
     property int progressValue  : vTreatmentTime.time_Elapsed
-    property int timeTextValue  : vTreatmentTime.time_Remaining
+    property int timeTextValue  : 30000//vTreatmentTime.time_Remaining
 
     property bool isRunning     : vHDTreatmentStates.txDialysis &&
-                               !( vHDTreatmentStates.sbWaitPump || vHDTreatmentStates.sbRunning )
+                                  !( vHDTreatmentStates.sbWaitPump || vHDTreatmentStates.sbRunning )
 
     signal clicked()
 
-    anchors.centerIn: parent
-    width : _circle.width
-    height: _circle.height
     color: "transparent"
+    width: _circle.width
+    height: _circle.height
 
     ProgressCircle { id: _circle
-        minimum: _root.minimum
-        maximum: _root.maximum
+        objectName: "circle"
 
-        anchors.centerIn  : parent
-        value: _root.progressValue
+        minimum: 0//_root.minimum
+        maximum: 60//_root.maximum
+
+        anchors.fill  : parent
+        value: 45//_root.progressValue
+        thickness   : 30
+        circle.shadow.color: Colors.mainTreatmentLighterBlue
+        circle.fillColor: Colors.mainTreatmentDarkerBlue
+        circle.showGradient: _root.isRunning
+        circle.runAnimation: _root.isRunning
+        circle.startGradientColor: "#2A5A93"
+//        circle.opacity: 0
+        color: _root.isRunning ? Colors.borderButton : "#9B864E"
     }
 
     TimeText { id: _timeText
+        objectName: "timeText"
+
         anchors.centerIn  : parent
         seconds : _root.timeTextValue
         secondsVisible: _root.isRunning
+        textWeight: Font.Normal
+        secsPixelSize: 35
+        secondsLeftMargin: 10
     }
 
-    Rectangle { id: _timeTitleRect
-        color: "Transparent"
-        anchors.horizontalCenter: _timeText.horizontalCenter
-        anchors.bottom: _timeText.top
+    Item { id: _timeTitleRect
+        objectName: "timeTextRect"
 
-        width   : _timeTitle.width + _arrowImage.width + _arrowImage.anchors.leftMargin
-        height  : _timeTitle.height
+        anchors {
+            horizontalCenter: _root.horizontalCenter
+            bottom: _timeText.top
+            bottomMargin: Variables.defaultMargin * 2
+        }
 
+        width   : _root.width
+
         Text { id: _timeTitle
+            objectName: "timeTitle"
             text: qsTr("Time Remaining")
 
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+            }
+
             font.pixelSize: 26
+            font.weight: Font.Normal
             color: Colors.textMain
+        }
 
-            anchors.left: parent.left
-            Image { id: _arrowImage
-                visible: _root.isRunning
-                anchors.left  : parent.right
-                anchors.bottom: parent.baseline
-                anchors.leftMargin: 10
-                width : Variables.arrowWidth
-                height: Variables.arrowHeight
-                source: "qrc:/images/iArrowRight"
+        TreatmentSectionIcon { id  : _editTimeIcon
+            objectName: "editTimeIcon"
+            anchors {
+                bottom: _timeTitle.top
+                bottomMargin:  Variables.defaultMargin
+                horizontalCenter: parent.horizontalCenter
             }
+            iconSize            : 30
+            iconImage.source    : "qrc:/images/iEdit"
+            onClicked           : _root.isRunning = ! _root.isRunning // REMOVE Testing***********8
+//            onClicked           : _root.clicked()
         }
     }
 
     NotificationBarSmall { id: _notification
+        objectName: "notification"
+
+        anchors {
+            left: _timeTitleRect.left
+            leftMargin: Variables.defaultMargin
+            top: _timeTitleRect.bottom
+            topMargin: Variables.defaultMargin
+        }
+
         visible : ! _root.isRunning
         height  : 25
-        imageAutoSize: false
-        imageAnimated: true
         color: "transparent"
-        anchors {
-            leftMargin  : 80
-            bottomMargin: 80
-        }
 
-        imageSource : "qrc:/images/iPauseGray"
+        imageSource : "qrc:/images/iPauseOrange"
         text        : qsTr("Treatment Paused")
-        textColor   : "gray"
-        textfontSize: 16
-        rowAnchors.centerIn: null
+        textColor   : "#FFB836"
+        textfontSize: 26
     }
-
-    MouseArea { id: _mouseArea
-        anchors.fill: parent
-        onClicked: {
-            if (_root.isRunning) {
-                _root.clicked()
-            }
-        }
-    }
 }