Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r84fec1666e63db5d9cf5ab57113c467376aca2d6 -r861179f9b370bbbf286228837d52489d184231dc
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 84fec1666e63db5d9cf5ab57113c467376aca2d6)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 861179f9b370bbbf286228837d52489d184231dc)
@@ -234,7 +234,7 @@
 o_PreTreatmentSampleStack_button_TouchRect                              = {"container": o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_button",                                                                                                                                   "type": "TouchRect",                                                  "unnamed": 1          }
 o_preTreatmentStack_repeater_Repeater                                   = {"container": o_preTreatmentStack_PreTreatmentStack,                               "id": "repeater",                                                                                                                                  "type": "Repeater",                                                   "unnamed": 1          }
 o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,            "id": "_bpMeasurementIntervalControl",                                                                                                              "type": "ValueAdjusterCustom",                                        "unnamed": 1          }
-o_notification_bar                                                      = {"container": o_Overlay,                                                                                                                       "objectName": "NotificationBar",                                                       "type": "NotificationBarSmall"                                                              }
+o_notification_bar                                                      ={"container": mainTreatmentScreen, "objectName": "_notification", "type": "NotificationBarSmall"}
 o_treatmentHome_editButton_IconButton                                   = {"container": mainTreatmentScreen,                                                     "id": "_editButton",                                                                                                                           "type": "IconButton",                                                "unnamed": 1           }
 o_treatmentHome_treatmentPressures_TreatmentPressures                   = {"container": mainTreatmentScreen,                                                                                                             "objectName": "treatmentPressures",                                                    "type": "TreatmentPressures"                                                                }
 o_valueAdjuster_ValueAdjuster                                           = {"container": o_Overlay,                                                                                                                       "objectName": "_valueAdjuster",                                                        "type": "ValueAdjuster",                                                                    }
@@ -254,4 +254,33 @@
 o_ufRate_LabelUnitText                                                  = {"container": o_Overlay,                                                                                                                       "objectName": "_ufRate",                                                               "type": "LabelUnitText"                                                                     }
 o_newTreatmentDuration_LabelUnitText                                    = {"container": o_Overlay,                                                                                                                       "objectName": "_newTreatmentDuration",                                                 "type": "LabelUnitText"                                                                     }
 
+#New design create Rx
+o_createHDTreatment_TouchRect                                   = {"container": o_standByScreen_MainHome,                                               "id": "_createHDTreatment",                                                                                                                             "type": "TouchRect",                                                  "unnamed": 1           }
+o_PreTreatmentCreate_leftColumn_Column                          = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_leftColumn",                                                                                                                                    "type": "Column",                                                     "unnamed": 1           }
+o_PreTreatmentCreate_rightColumn_Column                         = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_rightColumn",                                                                                                                                   "type": "Column",                                                     "unnamed": 1           }
+o_LabelUnitValueAdjuster_LabelUnitValueAdjuster                 = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster",                                                                                                                                                                             "type": "LabelUnitValueAdjuster"                                                             }
+o_heparinDispensingRate_LabelUnitValueAdjuster                  = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster",                     "id": "_heparinDispensingRate",                                                                                                                         "type": "LabelUnitValueAdjuster"                                                             }
+o_heparinDeliveryDuration_LabelUnitValueAdjuster                = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster",                     "id": "_heparinDeliveryDuration",                                                                                                                       "type": "LabelUnitValueAdjuster"                                                             }
+o_PreTreatmentCreate_leftColumn_Column_2                        = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_leftColumn",                                                                                                                                    "type": "Column",                                                     "unnamed": 1           }
+o_PreTreatmentCreate_rightColumn_Column_2                       = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_rightColumn",                                                                                                                                   "type": "Column",                                                     "unnamed": 1           }
+o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster              = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_sodium",                                                    "objectName": "_LabelUnitValueAdjuster",                                            "type": "LabelUnitValueAdjuster"                                                             }
+o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster         = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_bicarbonate",                                               "objectName": "_LabelUnitValueAdjuster",                                            "type": "LabelUnitValueAdjuster"                                                             }
+o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster    = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_fluidBolusVolume",                                          "objectName": "_LabelUnitValueAdjuster",                                            "type": "LabelUnitValueAdjuster"                                                             }
+o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_primeRinsebackVolume",                                      "objectName": "_LabelUnitValueAdjuster",                                             "type": "LabelUnitValueAdjuster"                                                            }
+o_PreTreatmentCreate_listView_ListView                          = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_listView",                                                                                                                                      "type": "ListView",                                                   "unnamed": 1           }
+o_createHDFTreatment_TouchRect                                  = {"container": o_standByScreen_MainHome,                                               "id": "_createHDFTreatment",                                                                                                                            "type": "TouchRect",                                                  "unnamed": 1           }
+o_PreTreatmentCreate_hdfTreatmentMode_LabelUnitContainer        = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_hdfTreatmentMode",                                                                                                                              "type": "LabelUnitContainer",                                         "unnamed": 1           }
+o_PreTreatmentCreate_treatmentModalityComboBox_BaseComboBox     = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_treatmentModalityComboBox",                                                                                                                     "type": "BaseComboBox",                                               "unnamed": 1           }
+o_vitals_close_btn                                              = {"container": o_Overlay,                                                       "id": "_image",                                 "source": "qrc:/images/iClose",        "type": "Image",                                "unnamed": 1                                                }
+o_treatmentHome_1_Request_is_not_allowed_in_the_current_operating_mode_Text = {"container": mainTreatmentScreen, "text": "[1] Request is not allowed in the current operating mode", "type": "Text", "unnamed": 1, "visible": True}
 
+
+
+
+
+
+
+
+
+
+