Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r5242b0f3bde261dff5670b39bdb263f084d237b6 -r3a5e8df68c2370134a53c29d7f8f47a8efb66f4d
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 5242b0f3bde261dff5670b39bdb263f084d237b6)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 3a5e8df68c2370134a53c29d7f8f47a8efb66f4d)
@@ -407,7 +407,8 @@
 
 #patient vitals
 o_treatmentVitals                                               = {"container": mainTreatmentScreen,                                                                                           "objectName": "treatmentVitals",                                                                                 "type": "TreatmentVitals"                                                                   }                  
-o_treatmentHome_editButton_IconButton                           = {"container": o_treatmentVitals,                                                      "id": "_editButton",                                                                                                                                    "type": "IconButton",                                               "unnamed": 1            }
+# o_treatmentHome_editButton_IconButton                           = {"container": o_treatmentVitals,                                                      "id": "_editButton",                                                                                                                                    "type": "IconButton",                                               "unnamed": 1            }
+o_treatmentHome_editButton_IconButton                                   = {"container": mainTreatmentScreen,                                                     "id": "_editButton",                                                                                                                                   "type": "IconButton",                                                "unnamed": 1                             }
 o_vitalsButton_VitalsButton                                     = {"container": o_Gui_MainView,                                                  "id": "_vitalsButton",                                                                 "type": "VitalsButton",                         "unnamed": 1                                                }
 o_bloodPressureSystolic_TextEntry                               = {"container": o_Overlay,                                                       "id": "_bloodPressureSystolic",                                                        "type": "TextEntry",                            "unnamed": 1                                                }
 o_bloodPressureDiastolic_TextEntry                              = {"container": o_Overlay,                                                       "id": "_bloodPressureDiastolic",                                                       "type": "TextEntry",                            "unnamed": 1                                                }
@@ -462,6 +463,9 @@
 o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_bicarbonateConcentrateComboBox",                                                                                                                "type": "BaseComboBox",                                               "unnamed": 1           }
 o_PreTreatmentCreate_treatmentModalityComboBox_BaseComboBox     = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_treatmentModalityComboBox",                                                                                                                     "type": "BaseComboBox",                                               "unnamed": 1           }
 o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1}
+o_secondaryPatientID_LabelUnitContainer                         = {"container": o_Overlay,                                                              "id": "_secondaryPatientID",                                                                                                                            "type": "LabelUnitContainer",                                         "unnamed": 1           }
+o_patientID_LabelUnitContainer                                  = {"container": o_Overlay,                                                              "id": "_patientID",                                                                                                                                     "type": "LabelUnitContainer",                                         "unnamed": 1           }
+o_PreTreatmentCreate_patientID_LabelUnitContainer               = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_patientID",                                                                                                                                     "type": "LabelUnitContainer",                                         "unnamed": 1          }
 
 # Edit Treatment Parameters
 o_treatmentHome_treatmentPressures_TreatmentPressures                   = {"container": mainTreatmentScreen,                                                                                                             "objectName": "treatmentPressures",                                                    "type": "TreatmentPressures"                                                                }
@@ -477,7 +481,13 @@
 o_newTreatmentDuration_LabelUnitValueAdjuster                           = {"container": o_Overlay,                                                                                                                       "objectName": "_newTreatmentDuration",                                                 "type": "LabelUnitValueAdjuster"                                                            }
 o_ufRate_LabelUnitText                                                  = {"container": o_Overlay,                                                                                                                       "objectName": "_ufRate",                                                               "type": "LabelUnitText"                                                                     }
 o_newTreatmentDuration_LabelUnitText                                    = {"container": o_Overlay,                                                                                                                       "objectName": "_newTreatmentDuration",                                                 "type": "LabelUnitText"                                                                     }
+o_arterialWindow_LabelUnitValueAdjuster                                 = {"container": o_Overlay,                                                                                                                        "objectName": "_arterialWindow",                                                      "type": "LabelUnitValueAdjuster"                                                            }
+o_venousWindow_LabelUnitValueAdjuster                                   = {"container": o_Overlay,                                                                                                                        "objectName": "_venousWindow",                                                        "type": "LabelUnitValueAdjuster"                                                            }
+o_venousAsymmetricWindow_LabelUnitValueAdjuster                         = {"container": o_Overlay,                                                                                                                        "objectName": "_venousAsymmetricWindow",                                              "type": "LabelUnitValueAdjuster"                                                            }
+o_tmpWindow_LabelUnitValueAdjuster                                      = {"container": o_Overlay,                                                                                                                        "objectName": "_tmpWindow",                                                           "type": "LabelUnitValueAdjuster"                                                            }
+o_treatmentHome_treatmentVitals_TreatmentVitals                         = {"container": mainTreatmentScreen,                                                                                                                       "objectName": "treatmentVitals",                                                     "type": "TreatmentVitals"                                                                   }
 
+
 #Rinseback
 o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack         = {"container": o_Gui_MainView,                                                                                                                            "objectName": "_EndTreatmentRinsebackStack",                                         "type": "EndTreatmentRinsebackStack",                                                       }
 o_EndTreatmentRinsebackStack_EndTreatmentRinseback              = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack,                                                                                   "objectName": "_EndTreatmentRinseback",                                              "type": "EndTreatmentRinseback",                                                            }
@@ -506,3 +516,23 @@
 o_Blood_Return_Complete_Recirculate_TouchRect                   = {"container": o_Overlay,                                                               "id": "_additionalTouch",                                                                                                                              "type": "TouchRect",                                                 "unnamed": 1           }
 o_Blood_Return_Complete_End_Treatment_TouchRect                 = {"container": o_Overlay,                                                               "id": "_cancelTouch",                                                                                                                                  "type": "TouchRect",                                                 "unnamed": 1           }
 o_Blood_Return_Complete_Fluid_Bolus_TouchRect                   = {"container": o_Overlay,                                                               "id": "_confirmTouch",                                                                                                                                 "type": "ConfirmButton",                                             "unnamed": 1           }
+o_controlLeftColumn_Column                                      = {"container": o_Overlay,                                                                                                                                  "objectName": "_controlLeftColumn",                                                 "type": "Column"                                                                            }
+o_controlRightColumn_Column                                     = {"container": o_Overlay,                                                                                                                                  "objectName": "_controlRightColumn",                                                "type": "Column"                                                                            }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+