diff --git a/custom_components/icloud3/ChangeLog.txt b/custom_components/icloud3/ChangeLog.txt
index 4c4b128..7e9b48d 100644
--- a/custom_components/icloud3/ChangeLog.txt
+++ b/custom_components/icloud3/ChangeLog.txt
@@ -3,6 +3,12 @@
 **Installing for the first time_** - See [here](https://gcobb321.github.io/icloud3_v3_docs/#/chapters/3.2-installing-and-configuring) for instructions on installing as a New Installation
 **iCloud3 v3 Documentation** - iCloud3 User Guide can be found [here](https://gcobb321.github.io/icloud3_v3_docs/#/)
 
+3.0.5.8
+.......................
+### Change Log - v3.0.5.8 (9/8/2024)
+1. CONFIGURATION - UPDATE DEVICES (Fixed) - An error would occur on the _Configure > Update Devices_ screen if the Mobile App Integration had not been set up or if the name had not been set up on one of the Mobile App devices was missing. This occured predominately when adding the first device to iCloud3.
+2. DEVICE_TRACKER ATTRIBUTES (Update) - There are 3 sections on thedevice  attribute's list to group similar attributes together. A title has been added to the section's dividing lines to prevent problems with other AddOns that use the attribute's name.
+
 
 3.0.5.7
 .......................
diff --git a/custom_components/icloud3/config_flow.py b/custom_components/icloud3/config_flow.py
index 46c74c6..9c78b29 100644
--- a/custom_components/icloud3/config_flow.py
+++ b/custom_components/icloud3/config_flow.py
@@ -3452,7 +3452,7 @@ async def _build_mobapp_entity_list(self):
                                 f"({slugify(self._mobapp_fname(entity_attrs))})")
                             for dev_trkr_entity, entity_attrs in mobapp_entity_data.items()}
         except:
-            pass
+            search_mobapp_devices = {}
 
         self.mobapp_list_text_by_entity_id.update(sort_dict_by_values(mobapp_devices))
         self.mobapp_list_text_by_entity_id.update(sort_dict_by_values(search_mobapp_devices))
@@ -3462,7 +3462,7 @@ async def _build_mobapp_entity_list(self):
 #-------------------------------------------------------------------------------------------
     @staticmethod
     def _mobapp_fname(entity_attrs):
-        return entity_attrs['name'] or entity_attrs['original_name']
+        return entity_attrs.get('name') or entity_attrs.get('original_name') or 'Unknown'
 
 #-------------------------------------------------------------------------------------------
     def _prepare_device_selection_list(self):
diff --git a/custom_components/icloud3/const.py b/custom_components/icloud3/const.py
index 1fc940c..11d6a84 100644
--- a/custom_components/icloud3/const.py
+++ b/custom_components/icloud3/const.py
@@ -10,7 +10,7 @@
 #
 #<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-VERSION                         = '3.0.5.7'
+VERSION                         = '3.0.5.8'
 VERSION_BETA                    = ''
 #-----------------------------------------
 DOMAIN                          = 'icloud3'
diff --git a/custom_components/icloud3/device_tracker.py b/custom_components/icloud3/device_tracker.py
index 9a458c0..266f645 100644
--- a/custom_components/icloud3/device_tracker.py
+++ b/custom_components/icloud3/device_tracker.py
@@ -363,7 +363,8 @@ def _get_extra_attributes(self):
             extra_attrs[LOCATED]        = self._get_sensor_value(LAST_LOCATED_DATETIME)
             alert                       = self._get_sensor_value(ALERT)
             extra_attrs[ALERT]          = alert if alert != BLANK_SENSOR_FIELD else ''
-            extra_attrs[f"{'-'*40}"]    = f"{'-'*35}"
+
+            extra_attrs[f"{'-'*5} DEVICE CONFIGURATION {'-'*20}"] = ''
             extra_attrs['integration']  = ICLOUD3
             extra_attrs[NAME]           = self._get_sensor_value(NAME)
             extra_attrs[PICTURE]        = self._get_sensor_value(PICTURE)
@@ -372,8 +373,7 @@ def _get_extra_attributes(self):
             extra_attrs['primary_home_zone']     = self.extra_attrs_primary_home_zone
             extra_attrs['away_time_zone_offset'] = self.extra_attrs_away_time_zone_offset
 
-            extra_attrs[f"{'-'*41}"]    = f"{'-'*35}"
-            # extra_attrs['data_source']  = f"{self._get_sensor_value(LOCATION_SOURCE)}"
+            extra_attrs[f"{'-'*5} LOCATION INFO {'-'*20}"] = self._get_sensor_value(LAST_UPDATE_DATETIME)
             extra_attrs[DEVICE_STATUS]  = self._get_sensor_value(DEVICE_STATUS)
             extra_attrs[LOCATION_SOURCE]= f"{self._get_sensor_value(LOCATION_SOURCE)}"
             extra_attrs[TRIGGER]        = self._get_sensor_value(TRIGGER)
@@ -391,7 +391,7 @@ def _get_extra_attributes(self):
             extra_attrs[NEXT_UPDATE]    = self._get_sensor_value(NEXT_UPDATE_DATETIME)
             extra_attrs['last_timestamp']= f"{self._get_sensor_value(LAST_LOCATED_SECS)}"
 
-            extra_attrs[f"{'-'*42}"]         = f"{'-'*35}"
+            xtra_attrs[f"{'-'*5} ICLOUD3 CONFIGURATION {'-'*19}"] = ''
             extra_attrs['icloud3_devices']   = ', '.join(Gb.Devices_by_devicename.keys())
             extra_attrs['icloud3_version']   = f"v{Gb.version}"
             extra_attrs['event_log_version'] = f"v{Gb.version_evlog}"
diff --git a/custom_components/icloud3/manifest.json b/custom_components/icloud3/manifest.json
index ced1e07..42184da 100644
--- a/custom_components/icloud3/manifest.json
+++ b/custom_components/icloud3/manifest.json
@@ -10,5 +10,5 @@
   "issue_tracker": "https://github.com/gcobb321/icloud3_v3/issues",
   "loggers": ["icloud3"],
   "requirements": [],
-  "version": "3.0.5.7"
+  "version": "3.0.5.8"
 }