Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r093155324dda47cba65693b72a2d1b0290d0c29a -rbd476995001c165188e4c86010bf8b0505d2ca35
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 093155324dda47cba65693b72a2d1b0290d0c29a)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision bd476995001c165188e4c86010bf8b0505d2ca35)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    PreTreatmentCreate.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      01-Mar-2021
+ * \date    (last)      05-Apr-2022
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  27-Jan-2020
+ * \date    (original)  12-Jan-2021
  *
  */
 
@@ -113,7 +113,7 @@
                 objectName  : "_heparinDispensingRate"
                 label       : qsTr("Heparin Dispensing Rate")
                 flickable   : _flickable
-                unit        : Variables.unitTextDispencingRate
+                unit        : Variables.unitTextDispensingRate
                 value       : vTreatmentCreate.heparinDispensingRate
                 decimal     : Variables.heparinPrecision
                 minimum     : vTreatmentCreate.heparinDispensingRateMin
@@ -174,7 +174,6 @@
             GridSelection { id  : _heparinType
                 objectName      : "_heparinTypeRect"
                 title           : qsTr("Heparin Type")
-                rowCount        : 1
                 labels          : vTreatmentCreate.heparinTypeOptions
                 onClicked       : vTreatmentCreate.heparinType = curIndex
             }
@@ -189,21 +188,19 @@
             GridSelection { id: _bicarbonateConcentrate
                 objectName  : "_bicarbonateConcentrateRect"
                 title        : qsTr("Bicarbonate Concentrate")
-                rowCount     : 1
-                colCount     : 2
                 labels : vTreatmentCreate.bicarbonateConcentrateOptions
                 onClicked   : vTreatmentCreate.bicarbonateConcentrate = curIndex
             }
 
             GridSelection { id: _dialyzerType
                 objectName  : "_dialyzerTypeRect"
-                title        : qsTr("Dialyzer Type")
-                rowCount     : 3
-                colCount     : 2
-                labels : vTreatmentCreate.dialyzerTypeOptions
+                title       : qsTr("Dialyzer Type")
+                labels      : vTreatmentCreate.dialyzerTypeOptions
                 onClicked   : vTreatmentCreate.dialyzerType = curIndex
             }
 
+            Item { height: 1; width: 1  /* TODO : there is a design flaw in here, this is a workaround */ }
+
             SliderCreateTreatment { id: _dialysateTemperature
                 objectName  : "_dialysateTemperature"
                 label       : qsTr("Dialysate Temperature")
@@ -485,10 +482,10 @@
         onBicarbonateConcentrate_ValidationFailed       : _bicarbonateConcentrate   .valid          = false
         onDialyzerType_ValidationFailed                 : _dialyzerType             .valid          = false
         onDialysateTemp_ValidationFailed                : _dialysateTemperature     .valid          = false
-        onArterialPressureLimitLow_ValidationFailed     : _arterialPressureLimits   .setLowValid    ( false )
-        onArterialPressureLimitHigh_ValidationFailed    : _arterialPressureLimits   .setHighValid   ( false )
-        onVenousPressureLimitLow_ValidationFailed       : _venousPressureLimits     .setLowValid    ( false )
-        onVenousPressureLimitHigh_ValidationFailed      : _venousPressureLimits     .setHighValid   ( false )
+        // onArterialPressureLimitLow_ValidationFailed     : _arterialPressureLimits   .setLowValid    ( false )
+        // onArterialPressureLimitHigh_ValidationFailed    : _arterialPressureLimits   .setHighValid   ( false )
+        // onVenousPressureLimitLow_ValidationFailed       : _venousPressureLimits     .setLowValid    ( false )
+        // onVenousPressureLimitHigh_ValidationFailed      : _venousPressureLimits     .setHighValid   ( false )
         onBloodPressureMeasureInterval_ValidationFailed : _bloodPressureInterval    .valid          = false
         onRinsebackFlowRate_ValidationFailed            : _rinsebackFlowRate        .valid          = false
         onScrollToParameter: {