Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -rfe084f2cccb0f0a258340cc431db2d67aeea7c75 -r36a488a3d29449ffedfe364d0031ed74d03c0ae0
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision fe084f2cccb0f0a258340cc431db2d67aeea7c75)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 36a488a3d29449ffedfe364d0031ed74d03c0ae0)
@@ -42,8 +42,8 @@
     signal sectionUltrafiltrationClicked()
     signal logVitalTime()
 
-    readonly property int cellWidth : _root.width / 7 - 10 // = screen width / # columns
-    readonly property int cellHeight: _root.height / 2 - Variables.notificationHeight - Variables.defaultMargin // = screen height / # rows - header bar
+    readonly property int cellWidth : (_root.width / 7) - 10 // = screen width / # columns
+    readonly property int cellHeight: (_root.height / 2) - Variables.notificationHeight - (Variables.defaultMargin * 2) // = screen height / # rows - header bar - margin
 
     onLogVitalTime: _treatmentVitals.updateVitalTime()
 
@@ -65,12 +65,12 @@
                 topMargin: Variables.defaultMargin * 3
                 horizontalCenter: parent.horizontalCenter
             }
-            height  : 200
-            width   : height
-            radius : height
-            color: "transparent"
+            height      : 200
+            width       : height
+            radius      : height
+            color       : "transparent"
             border.color: _treatmentFlows.editEnabled ? "#6697D2" :
-                                                                    "#A47E38"
+                                                        "#A47E38"
             border.width: 2
 
             Image { id  : _iconImage
@@ -80,21 +80,21 @@
                 height  : 80
                 width   : 80
                 fillMode: Image.PreserveAspectFit
-                source  : _treatmentFlows.editEnabled ?  "qrc:/images/iUnlock" :
+                source  : _treatmentFlows.editEnabled ? "qrc:/images/iUnlock" :
                                                         "qrc:/images/iLock"
             }
 
             Rectangle { id: _innerCircle
                 objectName:    "lockDialogInnerCircle"
 
                 anchors.centerIn: parent
-                color: "transparent"
-                border.color: _treatmentFlows.editEnabled ? "#8FC1FE" :
-                                                           "#CDAF78"
-                border.width: 1
-                height: parent.height - 20
-                width: height
-                radius : height
+                color           : "transparent"
+                border.color    : _treatmentFlows.editEnabled ? "#8FC1FE" :
+                                                                "#CDAF78"
+                border.width    : 1
+                height          : parent.height - 20
+                width           : height
+                radius          : height
             }
         }
     }
@@ -107,7 +107,7 @@
         anchors {
             fill: parent
             margins: Variables.defaultMargin
-            topMargin : Variables.notificationHeight + (Variables.defaultMargin * 2)// FIXME: 120 - to adjust from current headerbar implementation
+            topMargin : Variables.notificationHeight + 30
         }
 
         Row { id: _topRow