Index: leahi.qrc
===================================================================
diff -u -rf2aa3ee850de1023cfc011b845ed0364d251b749 -re310a3245018c3b5405ccddeb899f9c5b8a94d78
--- leahi.qrc	(.../leahi.qrc)	(revision f2aa3ee850de1023cfc011b845ed0364d251b749)
+++ leahi.qrc	(.../leahi.qrc)	(revision e310a3245018c3b5405ccddeb899f9c5b8a94d78)
@@ -15,7 +15,6 @@
         <file alias="SettingsDGCleaning.qml">sources/gui/qml/pages/settings/SettingsDGCleaning.qml</file>
         <file alias="SettingsDGScheduling.qml">sources/gui/qml/pages/settings/SettingsDGScheduling.qml</file>
         <file alias="SettingsVolumeBrightness.qml">sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml</file>
-        <file alias="SettingsBluetoothCuff.qml">sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml</file>
         <file alias="SettingsExportLogs.qml">sources/gui/qml/pages/settings/SettingsExportLogs.qml</file>
         <file alias="SettingsDeviceRegistration.qml">sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml</file>
         <file alias="SettingsInformation.qml">sources/gui/qml/pages/settings/SettingsInformation.qml</file>
@@ -27,6 +26,7 @@
         <file alias="SettingsDecommission.qml">sources/gui/qml/pages/settings/SettingsDecommission.qml</file>
         <file alias="SettingsInstitutionalRecord.qml">sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml</file>
         <file alias="SettingsLocalization.qml">sources/gui/qml/pages/settings/SettingsLocalization.qml</file>
+        <file alias="SettingsUserMode.qml">sources/gui/qml/pages/settings/SettingsUserMode.qml</file>
     </qresource>
     <qresource prefix="/dialogs">
         <file alias="ConfirmDialog.qml">sources/gui/qml/dialogs/ConfirmDialog.qml</file>
@@ -80,7 +80,6 @@
         <file alias="iEjectEnabled">resources/images/EjectEnabled.png</file>
         <file alias="iEjectDisabled">resources/images/EjectDisabled.png</file>
         <file alias="iEye">resources/images/eye.png</file>
-        <file alias="iCuff-Omron-BP7000">resources/images/Omron-bp7000.png</file>
         <file alias="iChevronLeft">resources/images/chevron-left.png</file>
         <file alias="iChevronRight">resources/images/chevron-right.png</file>
         <file alias="iDenaliDevice">resources/images/DenaliDevice.png</file>
@@ -104,6 +103,8 @@
         <file alias="iBackspace">resources/images/backspace.png</file>
         <file alias="iVitals">resources/images/Vitals.png</file>
         <file alias="iVitalsRed">resources/images/Vitals_Red.png</file>
+        <file alias="iCheckGreen">resources/images/check_green.png</file>
+        <file alias="iEyeClosed">resources/images/eye_closed.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -164,6 +165,8 @@
         <file alias="AlarmButtonRow.qml">sources/gui/qml/components/AlarmButtonRow.qml</file>
         <file alias="BaseComboBox.qml">sources/gui/qml/components/BaseComboBox.qml</file>
         <file alias="VitalsButton.qml">sources/gui/qml/components/VitalsButton.qml</file>
+        <file alias="PasswordRequirements.qml">sources/gui/qml/components/PasswordRequirements.qml</file>
+        <file alias="BaseSwitch.qml">sources/gui/qml/components/BaseSwitch.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
Index: sources/gui/qml/compounds/LabelUnitContainer.qml
===================================================================
diff -u -r24f141c96bdd5d4043e6ff05ea7ad962f63faabc -re310a3245018c3b5405ccddeb899f9c5b8a94d78
--- sources/gui/qml/compounds/LabelUnitContainer.qml	(.../LabelUnitContainer.qml)	(revision 24f141c96bdd5d4043e6ff05ea7ad962f63faabc)
+++ sources/gui/qml/compounds/LabelUnitContainer.qml	(.../LabelUnitContainer.qml)	(revision e310a3245018c3b5405ccddeb899f9c5b8a94d78)
@@ -46,21 +46,21 @@
         anchors {
             verticalCenter  : parent.verticalCenter
             left            : parent.left
-            leftMargin      : Variables.defaultMargin
+            leftMargin      : Variables.minVGap + Variables.defaultMargin
         }
         spacing : 10
 
         Text { id: _title
             anchors.verticalCenter  : _titleRow.verticalCenter
             color                   : Colors.offWhite
-            font.pixelSize          : Fonts.fontPixelContainerTitle
+            font.pixelSize          : Fonts.fontPixelDefaultButton
         }
 
         Text { id: _unit
             anchors.baseline: _title.baseline
             text            : ("(%1)").arg(_root.unitText)
             color           : Colors.offWhite
-            font.pixelSize  : Fonts.fontPixelContainerUnit
+            font.pixelSize  : Fonts.fontUnit
             font.weight     : Font.Thin
             visible         : _root.unitText.length > 0
         }
Index: sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml
===================================================================
diff -u -r0498a13bb66d3a3b0814521d794e737b5dd9a372 -re310a3245018c3b5405ccddeb899f9c5b8a94d78
--- sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml	(.../AcidConcentrateAdjustment.qml)	(revision 0498a13bb66d3a3b0814521d794e737b5dd9a372)
+++ sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml	(.../AcidConcentrateAdjustment.qml)	(revision e310a3245018c3b5405ccddeb899f9c5b8a94d78)
@@ -32,8 +32,9 @@
                                                                 .arg(_calciumValueControl.value.toFixed(Variables.calciumPrecision))
                                                                 .arg(Variables.unitTextCalcium)
 
-    width           : 1000
-    height          : 600
+    height          : Variables.smallDialogHeight
+    width           : Variables.smallDialogWidth
+    padding         : Variables.defaultMargin
     onVisibleChanged: visible ? vTreatmentRanges.doPopulateAcidConcentrate( vTreatmentCreate.acidConcentrateSet,
                                                                             vTreatmentCreate.acidConcentrate) :
                                 notificationText = ""
Index: sources/gui/qml/globals/Fonts.qml
===================================================================
diff -u -r24f141c96bdd5d4043e6ff05ea7ad962f63faabc -re310a3245018c3b5405ccddeb899f9c5b8a94d78
--- sources/gui/qml/globals/Fonts.qml	(.../Fonts.qml)	(revision 24f141c96bdd5d4043e6ff05ea7ad962f63faabc)
+++ sources/gui/qml/globals/Fonts.qml	(.../Fonts.qml)	(revision e310a3245018c3b5405ccddeb899f9c5b8a94d78)
@@ -57,6 +57,14 @@
     readonly property int fontPixelFluidUnit        : 22
     readonly property int fontPixelFluidVolume      : 16
 
+    readonly property int fontHeaderbarUser         : 18
+    readonly property int fontHeaderbarTitle        : 35
+    readonly property int fontHeaderbarTime         : 40
+    readonly property int fontHeaderbarDate         : 22
+    readonly property int fontHeaderbarTimezone     : 14
+
+    readonly property int fontUnit                  : 18
+
     readonly property int fontPixelConfirm          : 21
     readonly property int fontPixelBack             : 17
 
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -re7adb742d7dd362b2deb795259694b223eea3bc0 -re310a3245018c3b5405ccddeb899f9c5b8a94d78
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision e7adb742d7dd362b2deb795259694b223eea3bc0)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision e310a3245018c3b5405ccddeb899f9c5b8a94d78)
@@ -127,18 +127,16 @@
     readonly property int treatmentPressureTitleWidth           : 125
     readonly property int treatmentPressureValueWidth           : 140
 
-    readonly property int ultrafiltrationHeaderMargin           : 50
-    readonly property int ultrafiltrationProgressbarWidth       : 880
+    readonly property int ultrafiltrationProgressBarWidth       : 769
+    readonly property int ultraFiltrationProgressBarHeight      : 25
+    readonly property int ultrafiltrationProgressBarRadius      : 3
     readonly property int ultrafiltrationAdjustmtenOptionWidth  : 520
     readonly property int ultrafiltrationAdjustmtenOptionHeight : 275
-    readonly property int ultraFiltrationProgressBarHeight      : 25
-    readonly property int ultraFiltrationEditSliderHeight       : sliderDefaultBodyHeight // to be consistent with other sliders
+    readonly property int ultrafiltrationConfirmValueWidth      : 416
     readonly property int ultrafiltrationButtonWidth            : 300
     readonly property int ultrafiltrationButtonHeight           : 60
-    readonly property int ultrafiltrationButtonBottomMargin     : 60
-    readonly property int ultrafiltrationRangeMarkerWidth       : 4
-    readonly property int ultrafiltrationRangeMarkerHandleWidth : 12
-    readonly property int ultrafiltrationContentMargin          : 200
+    readonly property int ultrafiltrationRangeMarkerWidth       : 3
+    readonly property int ultrafiltrationRangeMarkerTextMargin  : 5
 
     readonly property int silenceIconMargin                     : 10
     readonly property int notificationBarIconMargin             : 10
@@ -203,10 +201,12 @@
 
     readonly property int textBoxRadius                         : 5
     readonly property int textBoxBorderWidth                    : 2
-    readonly property int adjustmentDialogWidth                 : applicationWidth * 0.7
-    readonly property int adjustmentDialogHeight                : applicationHeight * 0.7
+    readonly property int adjustmentDialogWidth                 : 1400
+    readonly property int adjustmentDialogHeight                : 814
+    readonly property int adjustmentDialogRadius                : 8
     readonly property int adjustmentHeaderHeight                : 120
     readonly property int adjustmentButtonMargin                : 30
+    readonly property int adjustmentNotificationHeight          : 77
 
     readonly property int defaultButtonHeight                   : 60
     readonly property int defaultButtonWidth                    : 244
Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
===================================================================
diff -u -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f -re310a3245018c3b5405ccddeb899f9c5b8a94d78
--- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml	(.../PreTreatmentConnectionStack.qml)	(revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
+++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml	(.../PreTreatmentConnectionStack.qml)	(revision e310a3245018c3b5405ccddeb899f9c5b8a94d78)
@@ -82,11 +82,11 @@
             }
 
         }
-        Connections { target: vTreatmentVitals
-            function onDidTrigger               ( vSystolic, vDiastolic, vHeartRate ) {
-                _preTreatmentVitals.update( vSystolic, vDiastolic, vHeartRate )
-            }
-        }
+//        Connections { target: vTreatmentVitals
+//            function onDidTrigger               ( vSystolic, vDiastolic, vHeartRate ) {
+//                _preTreatmentVitals.update( vSystolic, vDiastolic, vHeartRate )
+//            }
+//        }
     }
 
 //    SettingsBluetoothCuff       { id: _settingsBluetoothPage
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -r80b727733768477975addc967b3d6b04ed39e598 -re310a3245018c3b5405ccddeb899f9c5b8a94d78
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision 80b727733768477975addc967b3d6b04ed39e598)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision e310a3245018c3b5405ccddeb899f9c5b8a94d78)
@@ -25,8 +25,8 @@
     contentItem.objectName: "TreatmentAdjustmentVitals"
     titleText           : qsTr("Vitals")
     titlePixelSize      : Fonts.fontPixelSection
-    height              : Variables.numPadHeight
-    width               : 1000
+    height              : Variables.smallDialogHeight
+    width               : Variables.smallDialogWidth
     x                   : numPad.isOpened ? Math.round((Variables.applicationWidth - width) / 2) - 200 :
                                             Math.round((Variables.applicationWidth - width) / 2)
     notification.textfontSize   : 20