Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -ra9cc981e51277c1c258446920ac7e7612da49159 -r21ce57716379c74355e4d268097b1b44bb59170c
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision a9cc981e51277c1c258446920ac7e7612da49159)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 21ce57716379c74355e4d268097b1b44bb59170c)
@@ -174,13 +174,13 @@
             ID_AdjustDisposablesConfirmReq              = 0x6200, // 98  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             ID_AdjustDisposablesConfirmRsp              = 0xAD00, // 173 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment SelfTest Dry Progress Data
-            ID_SelfTestDryData                          = 0x6300, // 99
+            ID_SelfTestDryData                          = 0x630F, // 99     //// ----- @CRAPIZED: had to change to avoid duplication
             // Pre-Treatment Disposable Priming
             ID_AdjustDisposablesPrimeReq                = 0x3C0F, // 60     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustDisposablesPrimeRsp                = 0x3D0F, // 61     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DisposablesPrimeData                     = 0x43FF, // ??     //// ----- @CRAPIZED - FFed
             // Pre-Treatment Patient Connection Begin
-            ID_AdjustPatientConnectionBeginReq          = 0x6400, // 100
+            ID_AdjustPatientConnectionBeginReq          = 0x640F, // 100    //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustPatientConnectionBeginRsp          = 0x6500, // 101
             // Pre-Treatment Ultrafiltration initial volume
             ID_AdjustUltrafiltrationInitReq             = 0x4F0F, // 79  //// ----- @CRAPIZED: had to change to avoid duplication
@@ -238,8 +238,8 @@
             ID_AdjustSalineReq                          = 0x5E00, // 94
             ID_AdjustSalineRsp                          = 0x5F00, // 95
 
-            ID_AdjustVitalsReq                          = 0x9700, // 151 TESTING -- UPDATE WITH ACTUAL
-            ID_AdjustVitalsRsp                          = 0x9800, // 152 TESTING -- UPDATE WITH ACTUAL
+            ID_AdjustVitalsReq                          = 0x6300,
+            ID_AdjustVitalsRsp                          = 0x6400,
 
             ID_AdjustHeparinReq                         = 0x4B00, // 75
             ID_AdjustHeparinRsp                         = 0x4C00, // 76
Index: sources/gui/qml/components/NumPad.qml
===================================================================
diff -u -ree27c59d21daf9ad067d3cb5327fadd7c73b9838 -r21ce57716379c74355e4d268097b1b44bb59170c
--- sources/gui/qml/components/NumPad.qml	(.../NumPad.qml)	(revision ee27c59d21daf9ad067d3cb5327fadd7c73b9838)
+++ sources/gui/qml/components/NumPad.qml	(.../NumPad.qml)	(revision 21ce57716379c74355e4d268097b1b44bb59170c)
@@ -110,10 +110,10 @@
             anchors {
                 verticalCenter  :  parent.verticalCenter
                 right           : parent.right
-                rightMargin     : 5
+                rightMargin     : 10
             }
-            height  : Variables.headerIconDiameter
-            width   : Variables.headerIconDiameter
+            height  : 30
+            width   : 30
             fillMode: Image.PreserveAspectFit
             source  : isOpened ? "qrc:/images/iChevronLeft" :
                                  "qrc:/images/iChevronRight"
@@ -133,10 +133,23 @@
         color   : "white"
     }
 
+    Text { id: _range
+        anchors {
+            top             : _title.bottom
+            topMargin       : 10
+            horizontalCenter: parent.horizontalCenter
+        }
+        font {
+            pixelSize   : 20
+            weight      : Font.Medium
+        }
+        color           : "#E0CDA9"
+    }
+
     Rectangle { id: _numRect
         anchors {
             top             : _root.top
-            topMargin       : Variables.defaultMargin * 4
+            topMargin       : Variables.defaultMargin * 4.5
             horizontalCenter: _root.horizontalCenter
         }
         width   : 300
@@ -170,22 +183,12 @@
         anchors {
             horizontalCenter: parent.horizontalCenter
             top             :  _numRect.bottom
-            topMargin       : 10
+            topMargin       : 5
         }
         font.pixelSize  : 18
         color           : "white"
     }
 
-    Text { id: _range
-        anchors {
-            bottom          : _numRect.top
-            bottomMargin    : 15
-            horizontalCenter: parent.horizontalCenter
-        }
-        font.pixelSize  : 20
-        color           : "#E0CDA9"
-    }
-
     Grid { id: _numPadGrid
         anchors {
             left    : _root.left
@@ -218,11 +221,7 @@
                 icon.width          : 40
                 icon.height         : 40
                 enabled             : modelData === "." ? precision > 0 : true
-
-                font {
-                    pixelSize   : 30
-                    bold        : true
-                }
+                font.pixelSize   : 30
                 background: Rectangle { id: _keyBackground
                     color   : _keyButton.pressed ?  Colors.backgroundButtonSelectDark :
                                                     modelData === backSpace ? Qt.darker ("#263B57", 1.05) :
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
===================================================================
diff -u -rc1d0546e2d1a51ff919b2172ce647003359f0853 -r21ce57716379c74355e4d268097b1b44bb59170c
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision c1d0546e2d1a51ff919b2172ce647003359f0853)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision 21ce57716379c74355e4d268097b1b44bb59170c)
@@ -255,7 +255,7 @@
  *
  * | MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description          |
  * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:|
- * |0xXX00| 0x100  | 9     | Req  | Y   | UI  | TD   | Vitals Request |
+ * |0x6300| 0x100  | 9     | Req  | Y   | UI  | TD   | Vitals Request |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h
===================================================================
diff -u -r23121e17d1a6120ae4a31930e18de362d9533bcb -r21ce57716379c74355e4d268097b1b44bb59170c
--- sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h	(.../MTreatmentAdjustVitalsResponse.h)	(revision 23121e17d1a6120ae4a31930e18de362d9533bcb)
+++ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h	(.../MTreatmentAdjustVitalsResponse.h)	(revision 21ce57716379c74355e4d268097b1b44bb59170c)
@@ -30,7 +30,7 @@
  *
  * | MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description           |
  * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:|
- * |0xXX00| 0x020  | 6     | Rsp  | Y   | TD  | UI   | Vitals Response |
+ * |0x6400| 0x020  | 6     | Rsp  | Y   | TD  | UI   | Vitals Response |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/td/data/treatment/MTreatmentVitalsData.h
===================================================================
diff -u -rc1d0546e2d1a51ff919b2172ce647003359f0853 -r21ce57716379c74355e4d268097b1b44bb59170c
--- sources/model/td/data/treatment/MTreatmentVitalsData.h	(.../MTreatmentVitalsData.h)	(revision c1d0546e2d1a51ff919b2172ce647003359f0853)
+++ sources/model/td/data/treatment/MTreatmentVitalsData.h	(.../MTreatmentVitalsData.h)	(revision 21ce57716379c74355e4d268097b1b44bb59170c)
@@ -22,11 +22,11 @@
 
 /*!
  * \brief   The MTreatmentVitalsData class
- * \details The Saline Bolus adjustment response model
+ * \details The Vitals adjustment response model
  *
  * | MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description           |
  * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:|
- * |0xXX00| 0x100  | 7   | 1 Hz   | N   | TD  | All  | Saline Bolus Response |
+ * |0x6500| 0x100  | 7   | 1 Hz   | N   | TD  | All  | Vitals Response |
  *
  * | Payload  ||
  * |          ||