diff --git a/lib/pages/common/custom_table.dart b/lib/pages/common/custom_table.dart
index 10171c33..22baba36 100644
--- a/lib/pages/common/custom_table.dart
+++ b/lib/pages/common/custom_table.dart
@@ -131,7 +131,10 @@ class _DynamicTableState extends State<DynamicTable> {
                       child: Row(
                         children: [
                           if (widget.withCheckBox) _buildSelectAllCheckbox(),
-                          ...widget.headers.map((header) => _buildTableHeaderCell(header)),
+                          ...List.generate(widget.headers.length, (index) {
+                            return _buildTableHeaderCell(widget.headers[index], index);
+                          })
+                          //...widget.headers.map((header) => _buildTableHeaderCell(header)),
                         ],
                       ),
                     ),
@@ -224,7 +227,7 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildTableHeaderCell(String title) {
+  Widget _buildTableHeaderCell(String title, int index) {
     return Expanded(
       child: Container(
         decoration: const BoxDecoration(
@@ -235,7 +238,7 @@ class _DynamicTableState extends State<DynamicTable> {
         constraints: const BoxConstraints.expand(height: 40),
         alignment: Alignment.centerLeft,
         child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4),
+          padding: EdgeInsets.symmetric(horizontal: index == widget.headers.length - 1 ? 12 : 8.0, vertical: 4),
           child: Text(
             title,
             style: context.textTheme.titleSmall!.copyWith(
diff --git a/lib/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart b/lib/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart
index 6792027f..3928fb51 100644
--- a/lib/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart
+++ b/lib/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
+
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:intl/intl.dart';
@@ -33,190 +33,56 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
   int currentPage = 0;
 
   List<EventDevice> record = [
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:15:43'),
-        value: '2286'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:15:35'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:15:29'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:15:25'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:15:21'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:15:17'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:15:07'),
-        value: '2286'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:14:47'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:14:40'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:14:23'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2024-10-23 11:14:13'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:15:43'),
-        value: '2286'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:15:35'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:15:29'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:15:25'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:15:21'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:15:17'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:15:07'),
-        value: '2286'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:14:47'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:14:40'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:14:23'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-10-23 11:14:13'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:15:43'),
-        value: '2286'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:15:35'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:15:29'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:15:25'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:15:21'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:15:17'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:15:07'),
-        value: '2286'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:14:47'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:14:40'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:14:23'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-23 11:14:13'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-11 11:15:43'),
-        value: '2286'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-11 11:15:35'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-12 11:15:29'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-13 11:15:25'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-14 11:15:21'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-15 11:15:17'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-16 11:15:07'),
-        value: '2286'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-17 11:14:47'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-18 11:14:40'),
-        value: '2284'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-19 11:14:23'),
-        value: '2285'),
-    EventDevice(
-        code: 'VoltageA',
-        eventTime: DateTime.parse('2023-02-20 11:14:13'),
-        value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:15:43'), value: '2286'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:15:35'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:15:29'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:15:25'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:15:21'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:15:17'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:15:07'), value: '2286'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:14:47'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:14:40'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:14:23'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2024-10-23 11:14:13'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:15:43'), value: '2286'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:15:35'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:15:29'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:15:25'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:15:21'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:15:17'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:15:07'), value: '2286'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:14:47'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:14:40'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:14:23'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-10-23 11:14:13'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:15:43'), value: '2286'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:15:35'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:15:29'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:15:25'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:15:21'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:15:17'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:15:07'), value: '2286'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:14:47'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:14:40'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:14:23'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-23 11:14:13'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-11 11:15:43'), value: '2286'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-11 11:15:35'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-12 11:15:29'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-13 11:15:25'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-14 11:15:21'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-15 11:15:17'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-16 11:15:07'), value: '2286'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-17 11:14:47'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-18 11:14:40'), value: '2284'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-19 11:14:23'), value: '2285'),
+    EventDevice(code: 'VoltageA', eventTime: DateTime.parse('2023-02-20 11:14:13'), value: '2284'),
   ];
 
-  FutureOr<void> _onFetchDeviceStatus(
-      SmartPowerFetchDeviceEvent event, Emitter<SmartPowerState> emit) async {
+  FutureOr<void> _onFetchDeviceStatus(SmartPowerFetchDeviceEvent event, Emitter<SmartPowerState> emit) async {
     emit(SmartPowerLoading());
     try {
-      var status =
-          await DevicesManagementApi().getPowerClampInfo(event.deviceId);
+      var status = await DevicesManagementApi().getPowerClampInfo(event.deviceId);
       deviceStatus = PowerClampModel.fromJson(status);
 
       phaseData = [
@@ -248,22 +114,19 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
     }
   }
 
-  FutureOr<void> _onArrowPressed(
-      SmartPowerArrowPressedEvent event, Emitter<SmartPowerState> emit) {
+  FutureOr<void> _onArrowPressed(SmartPowerArrowPressedEvent event, Emitter<SmartPowerState> emit) {
     currentPage = (currentPage + event.direction + 4) % 4;
     emit(SmartPowerStatusLoaded(deviceStatus, currentPage));
     emit(GetDeviceStatus());
   }
 
-  FutureOr<void> _onPageChanged(
-      SmartPowerPageChangedEvent event, Emitter<SmartPowerState> emit) {
+  FutureOr<void> _onPageChanged(SmartPowerPageChangedEvent event, Emitter<SmartPowerState> emit) {
     currentPage = event.page;
     emit(SmartPowerStatusLoaded(deviceStatus, currentPage));
     emit(GetDeviceStatus());
   }
 
-  Future<void> _onFactoryReset(
-      SmartPowerFactoryReset event, Emitter<SmartPowerState> emit) async {
+  Future<void> _onFactoryReset(SmartPowerFactoryReset event, Emitter<SmartPowerState> emit) async {
     emit(SmartPowerLoading());
     try {
       final response = await DevicesManagementApi().factoryReset(
@@ -280,8 +143,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
     }
   }
 
-  Future<void> _onBatchControl(
-      PowerBatchControlEvent event, Emitter<SmartPowerState> emit) async {
+  Future<void> _onBatchControl(PowerBatchControlEvent event, Emitter<SmartPowerState> emit) async {
     final oldValue = deviceStatus.status;
 
     _updateLocalValue(event.code, event.value);
@@ -297,14 +159,11 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
     );
   }
 
-  Future<void> _onFetchBatchStatus(
-      SmartPowerFetchBatchEvent event, Emitter<SmartPowerState> emit) async {
+  Future<void> _onFetchBatchStatus(SmartPowerFetchBatchEvent event, Emitter<SmartPowerState> emit) async {
     emit(SmartPowerLoading());
     try {
-      final response =
-          await DevicesManagementApi().getPowerStatus(event.devicesIds);
-      PowerClampBatchModel deviceStatus =
-          PowerClampBatchModel.fromJson(response);
+      final response = await DevicesManagementApi().getPowerStatus(event.devicesIds);
+      PowerClampBatchModel deviceStatus = PowerClampBatchModel.fromJson(response);
 
       emit(SmartPowerLoadBatchControll(deviceStatus));
     } catch (e) {
@@ -336,11 +195,9 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
+          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
         } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: value));
+          response = await DevicesManagementApi().deviceControl(deviceId, Status(code: code, value: value));
         }
 
         if (!response) {
@@ -360,8 +217,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
     }
   }
 
-  void _revertValueAndEmit(String deviceId, String code, dynamic oldValue,
-      Emitter<SmartPowerState> emit) {
+  void _revertValueAndEmit(String deviceId, String code, dynamic oldValue, Emitter<SmartPowerState> emit) {
     _updateLocalValue(code, oldValue);
     emit(SmartPowerLoadBatchControll(deviceBatchStatus));
   }
@@ -418,10 +274,8 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
     int selectedYear = DateTime.now().year;
     int selectedMonth = DateTime.now().month;
 
-    FixedExtentScrollController yearController =
-        FixedExtentScrollController(initialItem: selectedYear - 1905);
-    FixedExtentScrollController monthController =
-        FixedExtentScrollController(initialItem: selectedMonth - 1);
+    FixedExtentScrollController yearController = FixedExtentScrollController(initialItem: selectedYear - 1905);
+    FixedExtentScrollController monthController = FixedExtentScrollController(initialItem: selectedMonth - 1);
 
     return await showDialog<DateTime>(
       context: context,
@@ -440,8 +294,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
                     padding: EdgeInsets.all(16.0),
                     child: Text(
                       'Select Month and Year',
-                      style:
-                          TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+                      style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
                     ),
                   ),
                   const Divider(),
@@ -484,8 +337,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
                               builder: (context, index) {
                                 return Center(
                                   child: Text(
-                                    DateFormat.MMMM()
-                                        .format(DateTime(0, index + 1)),
+                                    DateFormat.MMMM().format(DateTime(0, index + 1)),
                                     style: const TextStyle(fontSize: 18),
                                   ),
                                 );
@@ -500,8 +352,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
                   ),
                   const Divider(),
                   Padding(
-                    padding: const EdgeInsets.symmetric(
-                        horizontal: 16.0, vertical: 8.0),
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
@@ -514,8 +365,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
                         TextButton(
                           child: const Text('OK'),
                           onPressed: () {
-                            final selectedDateTime =
-                                DateTime(selectedYear, selectedMonth);
+                            final selectedDateTime = DateTime(selectedYear, selectedMonth);
                             Navigator.of(context).pop(selectedDateTime);
                           },
                         ),
@@ -533,8 +383,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
 
   Future<DateTime?> selectYear(BuildContext context) async {
     int selectedYear = DateTime.now().year;
-    FixedExtentScrollController yearController =
-        FixedExtentScrollController(initialItem: selectedYear - 1905);
+    FixedExtentScrollController yearController = FixedExtentScrollController(initialItem: selectedYear - 1905);
 
     return await showDialog<DateTime>(
       context: context,
@@ -553,8 +402,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
                     padding: EdgeInsets.all(16.0),
                     child: Text(
                       'Select Year',
-                      style:
-                          TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+                      style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
                     ),
                   ),
                   const Divider(),
@@ -581,8 +429,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
                   ),
                   const Divider(),
                   Padding(
-                    padding: const EdgeInsets.symmetric(
-                        horizontal: 16.0, vertical: 8.0),
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
@@ -624,9 +471,12 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
             Container(
-              color: Colors.white,
               height: 350,
               width: 350,
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(10),
+              ),
               child: Column(
                 children: [
                   Expanded(
@@ -642,8 +492,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
                   ),
                   const Divider(),
                   Padding(
-                    padding: const EdgeInsets.symmetric(
-                        horizontal: 16.0, vertical: 8.0),
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
@@ -675,8 +524,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
 
   String formattedDate = DateFormat('yyyy/MM/dd').format(DateTime.now());
 
-  void checkDayMonthYearSelected(
-      SelectDateEvent event, Emitter<SmartPowerState> emit) async {
+  void checkDayMonthYearSelected(SelectDateEvent event, Emitter<SmartPowerState> emit) async {
     Future<DateTime?> Function(BuildContext context)? dateSelector;
     String dateFormat;
     switch (currentIndex) {
@@ -702,7 +550,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
         return;
     }
     Future.delayed(const Duration(milliseconds: 500), () {
-      emit(SmartPowerLoading());
+      emit(FakeState());
     });
     // Use the selected picker
     await dateSelector(event.context).then((newDate) {
@@ -721,23 +569,18 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
   }
 
   List<EnergyData> energyDataList = [];
-  void _filterRecordsByDate(
-      FilterRecordsByDateEvent event, Emitter<SmartPowerState> emit) {
-    emit(SmartPowerLoading());
+  void _filterRecordsByDate(FilterRecordsByDateEvent event, Emitter<SmartPowerState> emit) {
+    // emit(SmartPowerLoading());
 
     if (event.viewType == 'Year') {
       formattedDate = event.selectedDate.year.toString();
-      filteredRecords = record
-          .where((record) => record.eventTime!.year == event.selectedDate.year)
-          .toList();
+      filteredRecords = record.where((record) => record.eventTime!.year == event.selectedDate.year).toList();
     } else if (event.viewType == 'Month') {
-      formattedDate =
-          "${event.selectedDate.year.toString()}-${getMonthShortName(event.selectedDate.month)}";
+      formattedDate = "${event.selectedDate.year.toString()}-${getMonthShortName(event.selectedDate.month)}";
 
       filteredRecords = record
           .where((record) =>
-              record.eventTime!.year == event.selectedDate.year &&
-              record.eventTime!.month == event.selectedDate.month)
+              record.eventTime!.year == event.selectedDate.year && record.eventTime!.month == event.selectedDate.month)
           .toList();
     } else if (event.viewType == 'Day') {
       formattedDate =
@@ -755,8 +598,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
     energyDataList = filteredRecords.map((eventDevice) {
       return EnergyData(
         event.viewType == 'Year'
-            ? getMonthShortName(
-                int.tryParse(DateFormat('MM').format(eventDevice.eventTime!))!)
+            ? getMonthShortName(int.tryParse(DateFormat('MM').format(eventDevice.eventTime!))!)
             : event.viewType == 'Month'
                 ? DateFormat('yyyy/MM/dd').format(eventDevice.eventTime!)
                 : DateFormat('HH:mm:ss').format(eventDevice.eventTime!),
@@ -775,8 +617,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
 
   void selectDateRange() async {
     DateTime startDate = dateTime!;
-    DateTime endDate = DateTime(startDate.year, startDate.month + 1, 1)
-        .subtract(Duration(days: 1));
+    DateTime endDate = DateTime(startDate.year, startDate.month + 1, 1).subtract(Duration(days: 1));
     String formattedEndDate = DateFormat('dd/MM/yyyy').format(endDate);
     endChartDate = ' - $formattedEndDate';
   }
diff --git a/lib/pages/device_managment/power_clamp/bloc/smart_power_state.dart b/lib/pages/device_managment/power_clamp/bloc/smart_power_state.dart
index 62af9e78..a46a3223 100644
--- a/lib/pages/device_managment/power_clamp/bloc/smart_power_state.dart
+++ b/lib/pages/device_managment/power_clamp/bloc/smart_power_state.dart
@@ -11,6 +11,7 @@ class SmartPowerState extends Equatable {
 class SmartPowerInitial extends SmartPowerState {}
 
 class SmartPowerLoading extends SmartPowerState {}
+
 class GetDeviceStatus extends SmartPowerState {}
 //GetDeviceStatus
 
@@ -25,6 +26,8 @@ class SmartPowerLoadBatchControll extends SmartPowerState {
 
 class DateSelectedState extends SmartPowerState {}
 
+class FakeState extends SmartPowerState {}
+
 class SmartPowerStatusLoaded extends SmartPowerState {
   final PowerClampModel deviceStatus;
   final int currentPage;
diff --git a/lib/pages/device_managment/power_clamp/view/power_info_card.dart b/lib/pages/device_managment/power_clamp/view/power_info_card.dart
index b4dd487a..601b6346 100644
--- a/lib/pages/device_managment/power_clamp/view/power_info_card.dart
+++ b/lib/pages/device_managment/power_clamp/view/power_info_card.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/painting.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
@@ -20,57 +19,61 @@ class PowerClampInfoCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Expanded(
-      child: Padding(
-        padding: const EdgeInsets.all(5.0),
-        child: Container(
-          decoration: BoxDecoration(
-            color: ColorsManager.graysColor,
-            borderRadius: BorderRadius.circular(20),
-          ),
-          height: 55,
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            children: [
-              SvgPicture.asset(
-                iconPath,
-                fit: BoxFit.fill,
-              ),
-              Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Text(
-                    title,
-                    style: TextStyle(
-                      fontSize: 8,
-                      fontWeight: FontWeight.w400,
+      child: Container(
+        margin: const EdgeInsets.symmetric(horizontal: 6),
+        decoration: BoxDecoration(
+          color: ColorsManager.whiteColors,
+          borderRadius: BorderRadius.circular(20),
+        ),
+        height: 55,
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: [
+            const SizedBox(
+              width: 16,
+            ),
+            SvgPicture.asset(
+              iconPath,
+              fit: BoxFit.fill,
+            ),
+            const SizedBox(
+              width: 18,
+            ),
+            Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Text(
+                  title,
+                  style: const TextStyle(
+                    fontSize: 8,
+                    fontWeight: FontWeight.w400,
+                  ),
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Text(
+                      value,
+                      style: const TextStyle(
+                        fontSize: 15,
+                        fontWeight: FontWeight.w700,
+                      ),
                     ),
-                  ),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
-                      Text(
-                        value,
-                        style: TextStyle(
-                          fontSize: 15,
-                          fontWeight: FontWeight.w700,
-                        ),
+                    Text(
+                      unit,
+                      style: const TextStyle(
+                        fontSize: 15,
+                        fontWeight: FontWeight.w700,
                       ),
-                      Text(
-                        unit,
-                        style: TextStyle(
-                          fontSize: 15,
-                          fontWeight: FontWeight.w700,
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
-              )
-            ],
-          ),
+                    ),
+                  ],
+                ),
+              ],
+            )
+          ],
         ),
       ),
     );
diff --git a/lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart b/lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart
index 0c55dcad..2b16946f 100644
--- a/lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart
+++ b/lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart
@@ -3,9 +3,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/power_clamp/bloc/smart_power_event.dart';
 import 'package:syncrow_web/pages/device_managment/power_clamp/bloc/smart_power_state.dart';
+import 'package:syncrow_web/pages/device_managment/power_clamp/view/phase_widget.dart';
 import 'package:syncrow_web/pages/device_managment/power_clamp/view/power_chart.dart';
 import 'package:syncrow_web/pages/device_managment/power_clamp/view/power_info_card.dart';
-import 'package:syncrow_web/pages/device_managment/power_clamp/view/phase_widget.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_controls_container.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -29,6 +29,12 @@ class SmartPowerDeviceControl extends StatelessWidget
 
           if (state is SmartPowerLoading) {
             return const Center(child: CircularProgressIndicator());
+          } else if (state is FakeState) {
+            return _buildStatusControls(
+              currentPage: _blocProvider.currentPage,
+              context: context,
+              blocProvider: _blocProvider,
+            );
           } else if (state is GetDeviceStatus) {
             return _buildStatusControls(
               currentPage: _blocProvider.currentPage,
@@ -56,6 +62,7 @@ class SmartPowerDeviceControl extends StatelessWidget
   }) {
     PageController _pageController = PageController(initialPage: currentPage);
     return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 50),
       child: DeviceControlsContainer(
         child: Column(
           children: [
@@ -71,7 +78,7 @@ class SmartPowerDeviceControl extends StatelessWidget
               ],
             ),
             Padding(
-              padding: const EdgeInsets.all(10.0),
+              padding: const EdgeInsets.symmetric(vertical: 10),
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
@@ -102,23 +109,24 @@ class SmartPowerDeviceControl extends StatelessWidget
                 ],
               ),
             ),
-            const SizedBox(
-              height: 10,
-            ),
             PhaseWidget(
               phaseData: blocProvider.phaseData,
             ),
+            const SizedBox(
+              height: 10,
+            ),
             Container(
               padding: const EdgeInsets.only(
                 top: 10,
                 left: 20,
                 right: 20,
+                bottom: 10,
               ),
               decoration: BoxDecoration(
                 color: ColorsManager.whiteColors,
                 borderRadius: BorderRadius.circular(20),
               ),
-              height: 325,
+              height: 300,
               child: Column(
                 children: [
                   Container(
@@ -176,7 +184,7 @@ class SmartPowerDeviceControl extends StatelessWidget
                       children: [
                         EnergyConsumptionPage(
                           formattedDate:
-                              '${blocProvider.dateTime!.day}/${blocProvider.dateTime!.month}/${blocProvider.dateTime!.year} ${blocProvider.endChartDate}',
+                              '${blocProvider.formattedDate}${blocProvider.endChartDate}',
                           onTap: () {
                             blocProvider.add(SelectDateEvent(context: context));
                             blocProvider.add(FilterRecordsByDateEvent(
diff --git a/lib/pages/device_managment/shared/batch_control/factory_reset.dart b/lib/pages/device_managment/shared/batch_control/factory_reset.dart
index ea8f833c..8d1ba3d6 100644
--- a/lib/pages/device_managment/shared/batch_control/factory_reset.dart
+++ b/lib/pages/device_managment/shared/batch_control/factory_reset.dart
@@ -52,6 +52,7 @@ class _FactoryResetWidgetState extends State<FactoryResetWidget> {
                       child: DefaultButton(
                         height: 20,
                         elevation: 0,
+                        padding: 0,
                         onPressed: _toggleConfirmation,
                         backgroundColor: ColorsManager.greyColor,
                         child: Text(
@@ -69,14 +70,16 @@ class _FactoryResetWidgetState extends State<FactoryResetWidget> {
                       child: DefaultButton(
                         height: 20,
                         elevation: 0,
+                        padding: 0,
                         onPressed: widget.callFactoryReset,
                         backgroundColor: ColorsManager.red,
                         child: Text(
                           'Reset',
                           style: context.textTheme.bodyMedium!.copyWith(
-                              color: ColorsManager.whiteColors,
-                              fontWeight: FontWeight.w400,
-                              fontSize: 12),
+                            color: ColorsManager.whiteColors,
+                            fontWeight: FontWeight.w400,
+                            fontSize: 12,
+                          ),
                         ),
                       ),
                     ),