diff --git a/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart b/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart
index 148d085f..397909a8 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart
@@ -58,12 +58,15 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
           'Low Battery ($lowBatteryCount)',
         ];
 
-        final buttonLabel = (selectedDevices.length > 1) ? 'Batch Control' : 'Control';
+        final buttonLabel =
+            (selectedDevices.length > 1) ? 'Batch Control' : 'Control';
 
         return Column(
           children: [
             Container(
-              padding: isLargeScreenSize(context) ? const EdgeInsets.all(30) : const EdgeInsets.all(15),
+              padding: isLargeScreenSize(context)
+                  ? const EdgeInsets.all(30)
+                  : const EdgeInsets.all(15),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -72,7 +75,9 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                     tabs: tabs,
                     selectedIndex: selectedIndex,
                     onTabChanged: (index) {
-                      context.read<DeviceManagementBloc>().add(SelectedFilterChanged(index));
+                      context
+                          .read<DeviceManagementBloc>()
+                          .add(SelectedFilterChanged(index));
                     },
                   ),
                   const SizedBox(height: 20),
@@ -94,11 +99,14 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                     ),
                                   );
                                 } else if (selectedDevices.length > 1) {
-                                  final productTypes = selectedDevices.map((device) => device.productType).toSet();
+                                  final productTypes = selectedDevices
+                                      .map((device) => device.productType)
+                                      .toSet();
                                   if (productTypes.length == 1) {
                                     showDialog(
                                       context: context,
-                                      builder: (context) => DeviceBatchControlDialog(
+                                      builder: (context) =>
+                                          DeviceBatchControlDialog(
                                         devices: selectedDevices,
                                       ),
                                     );
@@ -112,7 +120,9 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                           textAlign: TextAlign.center,
                           style: TextStyle(
                             fontSize: 12,
-                            color: isControlButtonEnabled ? Colors.white : Colors.grey,
+                            color: isControlButtonEnabled
+                                ? Colors.white
+                                : Colors.grey,
                           ),
                         ),
                       ),
@@ -123,13 +133,17 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
             ),
             Expanded(
               child: Padding(
-                padding: isLargeScreenSize(context) ? const EdgeInsets.all(30) : const EdgeInsets.all(15),
+                padding: isLargeScreenSize(context)
+                    ? const EdgeInsets.all(30)
+                    : const EdgeInsets.all(15),
                 child: DynamicTable(
                   withSelectAll: true,
                   cellDecoration: containerDecoration,
                   onRowSelected: (index, isSelected, row) {
                     final selectedDevice = devicesToShow[index];
-                    context.read<DeviceManagementBloc>().add(SelectDevice(selectedDevice));
+                    context
+                        .read<DeviceManagementBloc>()
+                        .add(SelectDevice(selectedDevice));
                   },
                   withCheckBox: true,
                   size: context.screenSize,
@@ -146,23 +160,45 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                     'Last Offline Date and Time',
                   ],
                   data: devicesToShow.map((device) {
+                    final combinedSpaceNames = device.spaces != null
+                        ? device.spaces!
+                                .map((space) => space.spaceName)
+                                .join(' > ') +
+                            (device.community != null
+                                ? ' > ${device.community!.name}'
+                                : '')
+                        : (device.community != null
+                            ? device.community!.name
+                            : '');
+
                     return [
                       device.name ?? '',
                       device.productName ?? '',
                       device.uuid ?? '',
-                      device.unit?.name ?? '',
-                      device.room?.name ?? '',
-                      device.batteryLevel != null ? '${device.batteryLevel}%' : '-',
-                      formatDateTime(DateTime.fromMillisecondsSinceEpoch((device.createTime ?? 0) * 1000)),
+                      (device.spaces != null && device.spaces!.isNotEmpty)
+                          ? device.spaces![0].spaceName
+                          : '',
+                      combinedSpaceNames,
+                      device.batteryLevel != null
+                          ? '${device.batteryLevel}%'
+                          : '-',
+                      formatDateTime(DateTime.fromMillisecondsSinceEpoch(
+                          (device.createTime ?? 0) * 1000)),
                       device.online == true ? 'Online' : 'Offline',
-                      formatDateTime(DateTime.fromMillisecondsSinceEpoch((device.updateTime ?? 0) * 1000)),
+                      formatDateTime(DateTime.fromMillisecondsSinceEpoch(
+                          (device.updateTime ?? 0) * 1000)),
                     ];
                   }).toList(),
                   onSelectionChanged: (selectedRows) {
-                    context.read<DeviceManagementBloc>().add(UpdateSelection(selectedRows));
+                    context
+                        .read<DeviceManagementBloc>()
+                        .add(UpdateSelection(selectedRows));
                   },
-                  initialSelectedIds:
-                      context.read<DeviceManagementBloc>().selectedDevices.map((device) => device.uuid!).toList(),
+                  initialSelectedIds: context
+                      .read<DeviceManagementBloc>()
+                      .selectedDevices
+                      .map((device) => device.uuid!)
+                      .toList(),
                   isEmpty: devicesToShow.isEmpty,
                 ),
               ),