Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -rf91362971e3b7af39c96e20fd553cdbd49741f85 -r26af78da75502c56dcff8ad402e63d64a496f341
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision f91362971e3b7af39c96e20fd553cdbd49741f85)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 26af78da75502c56dcff8ad402e63d64a496f341)
@@ -15,7 +15,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Layouts 1.12
 
 // Project
 
@@ -42,12 +41,7 @@
 
     readonly property int cellWidth : _root.width / 7 - 10 // = screen width / # columns
     readonly property int cellHeight: _root.height / 2 - Variables.notificationHeight // = screen height / # rows - header bar
-    Component.onCompleted: {
-        print("*******************************cellWidth " + cellWidth)
-        print("******************************cellHeight " + cellHeight)
-    }
 
-
     Column { id: _rowLayout
         spacing: Variables.defaultMargin
 
@@ -75,19 +69,33 @@
 
             }
 
-            TreatmentSaline { id: _salineTreatment
+            TreatmentSaline { id: _salineTreatmentArea
                 width:  cellWidth + Variables.defaultMargin
                 height: cellHeight
             }
 
-            TreatmentSection { id: _vitalsMonitor
+            TreatmentVitals             { id: _vitalsTreatmentArea
                 width:  cellWidth + Variables.defaultMargin
                 height: cellHeight
+                onEditClicked: sectionVitalsClicked()
 
+                Text { id: _vitalCountdown
+                    color   : "gray"
+                    anchors {
+                        top         : parent.top
+                        right       : parent.right
+                        rightMargin : 50
+                    }
+                    horizontalAlignment : Text.AlignHCenter
+                    verticalAlignment   : Text.AlignVCenter
+                    height  : 15
+                    width   : 100
+                    text    : vTreatmentVitals.interval ? ( vTreatmentVitals.countdown ) : ""
+                    font.pixelSize: 16
+                }
+            }
 
-                header.title: qsTr("Vitals" )
 
-            }
 
             TreatmentSection { id: _pressureMonitor
                 width:  (cellWidth * 3) - (Variables.defaultMargin * 2) // without auto layouts needs to fine tune
@@ -144,36 +152,9 @@
 //        }
 //    }
 
-//    TreatmentVitals             { id: _vitalsTouchArea
-//        x       : Variables.screenGridLeftColumnX
-//        y       : Variables.screenGridRow2Y + 400
-//        width   : Variables.screenGridAreaWidth
-//        height  : Variables.screenGridAreaHeightRow2
-//        onClicked: {
-//            sectionVitalsClicked()
-//        }
-//        notification.text:  qsTr("Interval:" )
-//                          + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF"))
-//                          + " , "
-//                          + qsTr("Last Read:")
-//                          + " " +  vTreatmentVitals.lastRead
-//        Text { id: _vitalCountdown
-//            color   : "gray"
-//            anchors {
-//                top         : parent.top
-//                right       : parent.right
-//                rightMargin : 50
-//            }
-//            horizontalAlignment : Text.AlignHCenter
-//            verticalAlignment   : Text.AlignVCenter
-//            height  : 15
-//            width   : 100
-//            text    : vTreatmentVitals.interval ? ( vTreatmentVitals.countdown ) : ""
-//            font.pixelSize: 16
-//        }
-//    }
 
 
+
 //    TreatmentPressures          { id: _pressuresTouchArea
 //        x       : Variables.screenGridLeftColumnX
 //        y       : Variables.screenGridRow1Y + 400