Index: shared/scripts/names.py
===================================================================
diff -u -r920f076f75cc24a6f24cf20e7653a5de99969619 -r21e113990a26f27e696a29f9f46ceeb812985499
--- shared/scripts/names.py	(.../names.py)	(revision 920f076f75cc24a6f24cf20e7653a5de99969619)
+++ shared/scripts/names.py	(.../names.py)	(revision 21e113990a26f27e696a29f9f46ceeb812985499)
@@ -146,10 +146,10 @@
 o_fluid_text                     = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True}
 o_treatmentStart_SalineSection   = {"container": o_treatmentHome, "id": "_salineTouchArea", "type": "TreatmentSaline", "unnamed": 1, "visible": True}
 o_treatmentHome_mL_Text          = {"container": o_treatmentHome, "text": "mL", "type": "Text", "unnamed": 1, "visible": True}
-o_treatmentHome_cumalative_value = {"container": o_treatmentHome, "occurrence": 39, "type": "Text", "unnamed": 1, "visible": True}
-o_treatmentHome_cumalative_unit  = {"container": o_treatmentHome, "occurrence": 38, "type": "Text", "unnamed": 1, "visible": True}
-o_treatmentHome_delivered_value  = {"container": o_treatmentHome, "occurrence": 36, "type": "Text", "unnamed": 1, "visible": True}
-o_treatmentHome_delivered_unit  = {"container": o_treatmentHome, "occurrence": 35, "type": "Text", "unnamed": 1, "visible": True}
+o_treatmentHome_cumalative_value = {"container": o_treatmentHome, "id": "_cumulativeValue", "type": "Text", "unnamed": 1, "visible": True}
+o_treatmentHome_cumalative_unit  = {"container": o_treatmentHome, "id": "_cumulativeUnit", "type": "Text", "unnamed": 1, "visible": True}
+o_treatmentHome_delivered_value  = {"container": o_treatmentHome, "id": "_fluidValue", "type": "Text", "unnamed": 1, "visible": True}
+o_treatmentHome_delivered_unit  = {"container": o_treatmentHome, "id": "_fluidUnit", "type": "Text", "unnamed": 1, "visible": True}
 o_treatmentHome_ultrafiltrationTouchArea_TreatmentUltrafiltration = {"container": o_treatmentHome, "id": "_ultrafiltrationTouchArea", "type": "TreatmentUltrafiltration", "unnamed": 1, "visible": True}
 o_treatmentHome_startFluidButton_TouchRect = {"container": o_treatmentHome, "id": "_startFluidButton", "type": "TouchRect", "unnamed": 1, "visible": True}
 o_treatment_notification_rejection               = {"container": ":o_treatmentHome", "occurrence": 3, "objectName": "NotificationBar", "type": "NotificationBarSmall", "visible": True}
@@ -224,6 +224,7 @@
 o_dialysate_flow_maximum_value = {"container": o_Overlay, "occurrence": 2, "text": "0mL/min", "type": "Text", "unnamed": 1, "visible": True}
 o_handler_Rectangle = {"container": o_Overlay, "gradient": 0, "id": "_handler", "type": "Rectangle", "unnamed": 1, "visible": True}
 o_treatment_saline_notification_msg = {"container": o_treatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True}
+<<<<<<< HEAD
 
 
 #vitals 
@@ -595,3 +596,13 @@
 o_PreTreatmentBase_indicator_StepIndicator = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_indicator", "type": "StepIndicator", "unnamed": 1, "visible": True}
 o_PreTreatmentBase_headStepBullet_StepBullet = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_headStepBullet", "occurrence": 2, "type": "StepBullet", "unnamed": 1, "visible": True}
 o_PreTreatmentBase_gridStepsRest_Grid_2 = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_gridStepsRest", "occurrence": 10, "type": "Grid", "unnamed": 1, "visible": True}
+
+#saline bolus 
+o_rejection_msg = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "type": "Text", "unnamed": 1, "visible": True}
+o_treatmentHome_image_Image = {"container": o_treatmentHome, "id": "_image", "source": "qrc:/images/iPauseGray", "type": "Image", "unnamed": 1, "visible": True}
+o_treatmentHome_Maximum_cumulative_saline_bolus_volume_delivered_Text = {"container": o_treatmentHome, "text": "Maximum cumulative saline bolus volume delivered", "type": "Text", "unnamed": 1, "visible": True}
+o_treatmentHome_Treatment_Paused_Text = {"container": o_treatmentHome, "text": "Treatment Paused", "type": "Text", "unnamed": 1, "visible": True}
+o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True}
+o_treatmentHome_START_BOLUS_Text = {"container": o_treatmentHome, "text": "START BOLUS", "type": "Text", "unnamed": 1, "visible": True}
+o_treatmentHome_fluidProgressBar_ProgressBar = {"container": o_treatmentHome, "id": "_fluidProgressBar", "type": "ProgressBar", "unnamed": 1, "visible": True}
+