Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r0bb330c1823aad987899f72b12c302551d575c5a -rb421c6c45a7e2c173565968657a2f76139200c8f
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 0bb330c1823aad987899f72b12c302551d575c5a)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision b421c6c45a7e2c173565968657a2f76139200c8f)
@@ -19,10 +19,12 @@
 salineProgressBar           = {"container": mainTreatmentScreen,    "id": "_fluidProgressBar",              "type": "ProgressBar",      "unnamed": 1    }
 
 # settings_service_export_logs
+o_listView_ListView         = {"container": o_Gui_MainView,         "id": "_listView",                      "type": "ListView",         "unnamed": 1    }
+o_listView_delegateControl  = {"container": o_listView_ListView,    "index": 2, "objectName": "delegateControl", "type": "Item"                         }
+o_Settings_Menu             = {"container": o_listView_delegateControl,"objectName": "_touchRect2",         "type": "TouchRect"                         }
 o_SettingsHome              = {"container": o_Gui_MainView,         "objectName": "_SettingsHome",          "type": "SettingsHome"                      }
 o_SettingsExportLogs        = {"container": o_Gui_MainView,         "objectName": "_SettingsBase",          "type": "SettingsExportLogs"                }
 o_DeviceSettingsTitleText   = {"container": o_SettingsHome,         "id":"_titleText",                      "type": "Text",             "unnamed": 1    }
-o_ServiceText               = {"container": o_SettingsHome,                                                 "type": "Text",             "unnamed": 1    }
 o_SettingsInformation       = {"container": o_Gui_MainView,         "objectName": "_SettingsBase",          "type": "SettingsBase"                      }
 o_USBEjectButton            = {"container": o_SettingsExportLogs,   "id": "_usbEjectButton",                "type": "USBButton",        "unnamed": 1    }
 o_ExportLogsPageTitleText   = {"container": o_SettingsInformation,  "id":"_titleText",                      "type": "Text",             "unnamed": 1    }
@@ -31,9 +33,6 @@
 o_ExportButton              = {"container": o_SettingsExportLogs,   "id": "_logTypeExportButton",           "type": "ExportButton",     "unnamed": 1    }
 o_ExportLogsProgressRect    = {"container": o_SettingsExportLogs,   "id": "_progressRect",                  "type": "ProgressRect",     "unnamed": 1    }
 o_ExportLogsNotificationBar = {"container": o_SettingsExportLogs,   "id": "_information",                   "type": "NotificationBarSmall"              }
-o_DeviceSettingsPageExportLogs= {"container": o_SettingsHome,       "id": "_touchItem", "occurrence": 7,    "type": "TouchRect",        "unnamed": 1,   "visible": True    }
+o_DeviceSettingsGrid        = {"container": o_SettingsHome,         "id": "_grid",                          "type": "Grid",                             }
 
-#HeaderBar Information Pop up
-o_InformationIconButton     = {"container": o_Gui_MainView,         "id": "_informationButton",             "type": "IconButton",       "unnamed": 1    }
-o_InformationParameters     = {"container": o_Overlay,                                                      "type": "Text",             "unnamed": 1    }
-o_VersionColumn             = {"container": o_Overlay,              "id": "_versionColumn",                 "type": "Column",           "unnamed": 1    }
+