Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 -r7805806e4370be4d9207872e916f478875bd4ba6
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 7805806e4370be4d9207872e916f478875bd4ba6)
@@ -45,6 +45,47 @@
 
     onLogVitalTime: _vitalsTreatmentArea.updateVitalTime()
 
+    AutoHideInfo { id: _lockDialog
+        width: 600
+        height: 600
+        backgroundColor: "#091E31"
+
+        Rectangle { id: _mainCircle
+            anchors {
+                top: parent.top
+                topMargin: Variables.defaultMargin * 3
+                horizontalCenter: parent.horizontalCenter
+            }
+            height  : 200
+            width   : height
+            radius : height
+            color: "transparent"
+            border.color: _treatmentParametersMonitor.editEnabled ? "#6697D2" :
+                                                                    "#A47E38"
+            border.width: 3
+
+            Image { id  : _iconImage
+                anchors.centerIn    : parent
+                height  : 80
+                width   : 80
+                fillMode: Image.PreserveAspectFit
+                source  : _treatmentParametersMonitor.editEnabled ? "qrc:/images/iUnlock" :
+                                                                    "qrc:/images/iLock"
+            }
+
+            Rectangle { id: _innerCircle
+                anchors.centerIn: parent
+                color: "transparent"
+                border.color: _treatmentParametersMonitor.editEnabled ? "#8FC1FE" :
+                                                                        "#CDAF78"
+                border.width: 2
+                height: parent.height - 20
+                width: height
+                radius : height
+            }
+        }
+    }
+
     Column { id: _column
         spacing: Variables.defaultMargin
 
@@ -108,86 +149,28 @@
             spacing: Variables.defaultMargin
             height: cellHeight
 
-            TreatmentSection { id: _ultrafiltrationMonitor
+            TreatmentUltrafiltration    { id: _ultrafiltrationTreatmentArea;
                 width:  cellWidth * 3
                 height: cellHeight
-
-                header.title: qsTr("Ultrafiltration") + " (" + qsTr("UF") + ")"
-
+                onEditClicked   : sectionUltrafiltrationClicked()
             }
 
-            TreatmentSection { id: _treatmentParametersMonitor
+            TreatmentFlows { id: _treatmentParametersMonitor
                 width:  cellWidth * 4
                 height: cellHeight
 
-
-                header.title: qsTr("Treatment Parameters")
-                header.showLock: true
-
+                onEditClicked   : sectionFlowClicked()
+                onLockClicked   :  {
+                    _lockDialog.showDialog (
+                                editEnabled ? qsTr("Treatment Parameters Unlocked") :
+                                              qsTr("Treatment Parameters Locked"),
+                                3000
+                                )
+                }
             }
         }
-
-
-
     }
 
-
-
-
-
-
-
-
-
-//    TreatmentFlows              { id: _flowsTouchArea
-//        x                   : Variables.screenGridLeftColumnX
-//        y                   : Variables.screenGridRow3Y + 400
-//        width               : Variables.screenGridAreaWidth
-//        height              : Variables.screenGridAreaHeightRow3
-//        onClicked: {
-//            sectionFlowClicked()
-//        }
-//    }
-
-
-
-
-//    TreatmentPressures          { id: _pressuresTouchArea
-//        x       : Variables.screenGridLeftColumnX
-//        y       : Variables.screenGridRow1Y + 400
-//        width   : Variables.screenGridAreaWidth
-//        height  : Variables.screenGridAreaHeightRow1
-//        onClicked: {
-//            sectionPressuresClicked()
-//        }
-//    }
-
-//    // ---------- COLUMN RIGHT
-//    TreatmentUltrafiltration    { id: _ultrafiltrationTouchArea;
-//        x           : Variables.screenGridRightColumnX
-//        y           : Variables.screenGridRow1Y + 400
-//        width       : Variables.screenGridAreaWidth
-//        height      : Variables.screenGridAreaHeightRow1
-//        onClicked   : {
-//            sectionUltrafiltrationClicked()
-//        }
-//    }
-
-
-//    TreatmentSaline             { id: _salineTouchArea
-//        x           : Variables.screenGridRightColumnX
-//        y           : Variables.screenGridRow2Y + 400
-//        width       : Variables.screenGridAreaWidth
-//        height      : Variables.screenGridAreaHeightRow2
-//    }
-//    Line                        { x: Variables.screenGridRightLinesX; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength; }
-//    TreatmentHeparin            { id: _heparinTouchArea
-//        x           : Variables.screenGridRightColumnX
-//        y           : Variables.screenGridRow3Y + 400
-//        width       : Variables.screenGridAreaWidth
-//        height      : Variables.screenGridAreaHeightRow3
-//    }
-
 //    // ---------- Center
 //    TreatmentTime               { id: _treatmentTime
 //        onClicked: {