Index: sources/gui/qml/components/MainMenu.qml
===================================================================
diff -u -rbce1e6f584c921c9fa6945204ed1e1d38021fbc8 -r77e7c1e746bba703ab3aee61f8e19f398fd9ac00
--- sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision bce1e6f584c921c9fa6945204ed1e1d38021fbc8)
+++ sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision 77e7c1e746bba703ab3aee61f8e19f398fd9ac00)
@@ -57,10 +57,10 @@
     signal itemPressed(int vIndex)
 
     ListModel { id: _mainTreatmentModel
-        ListElement {   text: qsTr("Treatment");    visible: true;      screen:  0                                  }   // MainMenu.Treatment
-        ListElement {   text: qsTr("Trends");       visible: true;      screen:  1                                  }   // MainMenu.Trends
-        ListElement {   text: qsTr("Heparin");      visible: true; /*TODO: vSettings.heparinSyringePump */   screen: 2   }   // MainMenu.Heparin
-        ListElement {   text: qsTr("HDF");          visible: true;      screen:  3                                  }   // MainMenu.HDF
+        ListElement {   text: qsTr("Treatment");    visible: true;      screen:  0      }   // MainMenu.Treatment
+        ListElement {   text: qsTr("Trends");       visible: true;      screen:  1      }   // MainMenu.Trends
+        ListElement {   text: qsTr("Heparin");      visible: true;      screen:  2      }   // MainMenu.Heparin
+        ListElement {   text: qsTr("HDF");          visible: true;      screen:  3      }   // MainMenu.HDF
     }
 
     ListModel { id: _mainMenuModel
@@ -108,9 +108,9 @@
 
         delegate: Item { id: _delegateControl
             objectName  : "delegateControl"
-            width       : ListView.view.count ? model.visible ? ListView.view.width / ListView.view.count : 0 : 0
+            width       : ListView.view.count ? _delegateControl.visible ? ListView.view.width / ListView.view.count : 0 : 0
             height      : ListView.view.height
-            visible     : model.visible
+            visible     : model.screen === MainMenu.Heparin ? vSettings.heparinSyringePump : model.visible
 
             TouchRect { id : _touchRect
                 objectName: "_touchRect" + index
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -r77e7c1e746bba703ab3aee61f8e19f398fd9ac00
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 93b7d7da5dea9e0392e139b59117eb0315d6c343)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 77e7c1e746bba703ab3aee61f8e19f398fd9ac00)
@@ -197,7 +197,7 @@
     VTreatmentVitals                                    { id: vTreatmentVitals
         interval        : vTreatmentCreate.bloodPressureMeasureInterval
         canStartInterval: vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment
-        enableBPCuff    : true  // TODO: PRS 343 update with enable/disable Integrated Blood Pressure Cuff
+        enableBPCuff    : vSettings.integratedBPCuff
         onCanStartIntervalChanged : {
             if ( vTreatmentVitals.canStartInterval )    { vTreatmentVitals.doTimerStart()   }
             else                                        { vTreatmentVitals.doTimerStop()    }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -r77e7c1e746bba703ab3aee61f8e19f398fd9ac00
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 93b7d7da5dea9e0392e139b59117eb0315d6c343)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 77e7c1e746bba703ab3aee61f8e19f398fd9ac00)
@@ -30,7 +30,7 @@
     readonly property int rowSpacing    : Variables.defaultMargin * 3
     readonly property int columnSpacing : 15
     readonly property bool isValidated  : vTreatmentCreate.parametersValidated
-    readonly property bool heparinFeatured: true // TODO: vSettings.heparinSyringePump
+    readonly property bool heparinFeatured: vSettings.heparinSyringePump
 
     readonly property string editRx     : qsTr( "Edit Rx"    )
     readonly property string selectRx   : qsTr( "Select Rx"  )
Index: sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml
===================================================================
diff -u -rd2c4e611703fcb97794975dbc28f9a030b84bbf0 -r77e7c1e746bba703ab3aee61f8e19f398fd9ac00
--- sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml	(.../SettingsFeatureConfigurations.qml)	(revision d2c4e611703fcb97794975dbc28f9a030b84bbf0)
+++ sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml	(.../SettingsFeatureConfigurations.qml)	(revision 77e7c1e746bba703ab3aee61f8e19f398fd9ac00)
@@ -33,7 +33,7 @@
 
     confirmVisible  : false
 
-    /*contentItem: */Column {
+    contentItem: Column {
         spacing : 25
 
         LabelUnitContainer { id: _integratedBPCuff
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -re310a3245018c3b5405ccddeb899f9c5b8a94d78 -r77e7c1e746bba703ab3aee61f8e19f398fd9ac00
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision e310a3245018c3b5405ccddeb899f9c5b8a94d78)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision 77e7c1e746bba703ab3aee61f8e19f398fd9ac00)
@@ -154,6 +154,7 @@
             height                  : Variables.defaultButtonHeight
             isDefault               : true
             anchors.horizontalCenter: parent.horizontalCenter
+            enabled                 : vSettings.integratedBPCuff
 
             text    {
                 text            : qsTr("Measure Vitals")
Index: sources/view/settings/VSettings.cpp
===================================================================
diff -u -rd2c4e611703fcb97794975dbc28f9a030b84bbf0 -r77e7c1e746bba703ab3aee61f8e19f398fd9ac00
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision d2c4e611703fcb97794975dbc28f9a030b84bbf0)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision 77e7c1e746bba703ab3aee61f8e19f398fd9ac00)
@@ -44,7 +44,6 @@
     PROPERTY_POST_CONNECTION(VSettings, integratedBPCuff    );
     PROPERTY_POST_CONNECTION(VSettings, heparinSyringePump  );
     PROPERTY_POST_CONNECTION(VSettings, chemicalDisinfection);
->>>>>>> Stashed changes
     init = true;
 }
 
@@ -135,6 +134,7 @@
                         mUserMode       = _Settings.value(category, group, key).toBool    ();
                         keyValue[key]   = mUserMode ;
                         userMode        ( mUserMode);
+                    }
                     else if ( isintegratedBPCuff   (category, group, key) ) {
                         bool mIntegratedBPCuff;
                         mIntegratedBPCuff   = _Settings.value(category, group, key).toBool    ();