diff --git a/lib/features/devices/view/widgets/door_sensor/door_records_screen.dart b/lib/features/devices/view/widgets/door_sensor/door_records_screen.dart
index 9b4b961..556a983 100644
--- a/lib/features/devices/view/widgets/door_sensor/door_records_screen.dart
+++ b/lib/features/devices/view/widgets/door_sensor/door_records_screen.dart
@@ -72,11 +72,12 @@ class DoorRecordsScreen extends StatelessWidget {
                         ),
                       ),
                       // List of records for the specific date
-
                       DefaultContainer(
                         child: Column(
                           children: [
-                            ...recordsForDate.map((record) {
+                            ...recordsForDate.asMap().entries.map((entry) {
+                              final int idx = entry.key;
+                              final DeviceEvent record = entry.value;
                               final DateTime eventDateTime =
                                   DateTime.fromMillisecondsSinceEpoch(
                                       record.eventTime!);
@@ -107,9 +108,11 @@ class DoorRecordsScreen extends StatelessWidget {
                                       subtitle: Text('$formattedTime'),
                                     ),
                                   ),
-                                  const Divider(
-                                    color: ColorsManager.graysColor,
-                                  )
+                                  // Only add Divider if it's not the last item
+                                  if (idx != recordsForDate.length - 1)
+                                    const Divider(
+                                      color: ColorsManager.graysColor,
+                                    ),
                                 ],
                               );
                             }).toList(),
diff --git a/lib/features/devices/view/widgets/two_gang/two_timer_screen.dart b/lib/features/devices/view/widgets/two_gang/two_timer_screen.dart
index eb1fab5..c06c4c8 100644
--- a/lib/features/devices/view/widgets/two_gang/two_timer_screen.dart
+++ b/lib/features/devices/view/widgets/two_gang/two_timer_screen.dart
@@ -173,58 +173,56 @@ class TimerScheduleScreen extends StatelessWidget {
 
                                     children: [
                                       Center(
-                                        child: Container(
-                                          child: Column(
-                                            mainAxisAlignment:
-                                                MainAxisAlignment.center,
-                                            children: [
-                                              countNum > 0
-                                                  ? BodyLarge(
-                                                      text: _formatDuration(
-                                                          countNum),
-                                                      fontColor: ColorsManager
-                                                          .slidingBlueColor,
-                                                      fontSize: 40,
-                                                    )
-                                                  : CupertinoTimerPicker(
-                                                      mode:
-                                                          CupertinoTimerPickerMode
-                                                              .hm,
-                                                      onTimerDurationChanged:
-                                                          (Duration
-                                                              newDuration) {
-                                                        duration = newDuration;
-                                                      },
-                                                    ),
-                                              GestureDetector(
-                                                  onTap: () {
-                                                    if (state
-                                                        is LoadingNewSate) {
-                                                      return;
-                                                    }
-                                                    if (countNum > 0) {
-                                                      twoGangBloc.add(
-                                                          SetCounterValue(
-                                                              deviceCode:
-                                                                  deviceCode,
-                                                              duration: Duration
-                                                                  .zero));
-                                                    } else if (duration !=
-                                                        Duration.zero) {
-                                                      twoGangBloc.add(
-                                                          SetCounterValue(
-                                                              deviceCode:
-                                                                  deviceCode,
-                                                              duration:
-                                                                  duration));
-                                                    }
-                                                  },
-                                                  child: SvgPicture.asset(
-                                                      countNum > 0
-                                                          ? Assets.pauseIcon
-                                                          : Assets.playIcon)),
-                                            ],
-                                          ),
+                                        child: Column(
+                                          mainAxisAlignment:
+                                              MainAxisAlignment.center,
+                                          children: [
+                                            countNum > 0
+                                                ? BodyLarge(
+                                                    text: _formatDuration(
+                                                        countNum),
+                                                    fontColor: ColorsManager
+                                                        .slidingBlueColor,
+                                                    fontSize: 40,
+                                                  )
+                                                : CupertinoTimerPicker(
+                                                    mode:
+                                                        CupertinoTimerPickerMode
+                                                            .hm,
+                                                    onTimerDurationChanged:
+                                                        (Duration
+                                                            newDuration) {
+                                                      duration = newDuration;
+                                                    },
+                                                  ),
+                                            GestureDetector(
+                                                onTap: () {
+                                                  if (state
+                                                      is LoadingNewSate) {
+                                                    return;
+                                                  }
+                                                  if (countNum > 0) {
+                                                    twoGangBloc.add(
+                                                        SetCounterValue(
+                                                            deviceCode:
+                                                                deviceCode,
+                                                            duration: Duration
+                                                                .zero));
+                                                  } else if (duration !=
+                                                      Duration.zero) {
+                                                    twoGangBloc.add(
+                                                        SetCounterValue(
+                                                            deviceCode:
+                                                                deviceCode,
+                                                            duration:
+                                                                duration));
+                                                  }
+                                                },
+                                                child: SvgPicture.asset(
+                                                    countNum > 0
+                                                        ? Assets.pauseIcon
+                                                        : Assets.playIcon)),
+                                          ],
                                         ),
                                       ),
                                       SizedBox(