diff --git a/lib/features/scene/view/scene_view.dart b/lib/features/scene/view/scene_view.dart
index 82af686..96e5cdf 100644
--- a/lib/features/scene/view/scene_view.dart
+++ b/lib/features/scene/view/scene_view.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/devices/view/widgets/scene_listview.dart';
 import 'package:syncrow_app/features/scene/bloc/create_scene/create_scene_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
@@ -72,66 +73,75 @@ class SceneView extends StatelessWidget {
                             final scenes = state.scenes;
                             final automationList = state.automationList;
 
-                            return Expanded(
-                              child: ListView(
-                                children: [
-                                  ExpansionTile(
-                                    tilePadding: const EdgeInsets.symmetric(
-                                        horizontal: 6),
-                                    initiallyExpanded: true,
-                                    iconColor: ColorsManager.grayColor,
-                                    title: const BodySmall(
-                                        text: 'Tap to run routines'),
-                                    children: [
-                                      scenes.isNotEmpty
-                                          ? SceneGrid(
-                                              scenes: scenes,
-                                              loadingSceneId:
-                                                  state.loadingSceneId,
-                                              disablePLayButton: false,
-                                            )
-                                          : const Center(
-                                              child: BodyMedium(
-                                                text:
-                                                    'No scenes have been added yet',
-                                              ),
+                            return pageType
+                                ? Expanded(
+                                    child: SceneListview(
+                                    scenes: state.scenes,
+                                    loadingSceneId: state.loadingSceneId,
+                                  ))
+                                : Expanded(
+                                    child: ListView(
+                                      children: [
+                                        ExpansionTile(
+                                          tilePadding:
+                                              const EdgeInsets.symmetric(
+                                                  horizontal: 6),
+                                          initiallyExpanded: true,
+                                          iconColor: ColorsManager.grayColor,
+                                          title: const BodySmall(
+                                              text: 'Tap to run routines'),
+                                          children: [
+                                            scenes.isNotEmpty
+                                                ? SceneGrid(
+                                                    scenes: scenes,
+                                                    loadingSceneId:
+                                                        state.loadingSceneId,
+                                                    disablePLayButton: false,
+                                                  )
+                                                : const Center(
+                                                    child: BodyMedium(
+                                                      text:
+                                                          'No scenes have been added yet',
+                                                    ),
+                                                  ),
+                                            const SizedBox(
+                                              height: 10,
                                             ),
-                                      const SizedBox(
-                                        height: 10,
-                                      ),
-                                    ],
-                                  ),
-                                  ExpansionTile(
-                                    initiallyExpanded: true,
-                                    iconColor: ColorsManager.grayColor,
-                                    tilePadding: const EdgeInsets.symmetric(
-                                        horizontal: 6),
-                                    title: const BodySmall(text: 'Automation'),
-                                    children: [
-                                      automationList.isNotEmpty
-                                          ? SceneGrid(
-                                              scenes: automationList,
-                                              loadingSceneId:
-                                                  state.loadingSceneId,
-                                              disablePLayButton: true,
-                                            )
-                                          : const Center(
-                                              child: BodyMedium(
-                                                text:
-                                                    'No automations have been added yet',
-                                              ),
+                                          ],
+                                        ),
+                                        ExpansionTile(
+                                          initiallyExpanded: true,
+                                          iconColor: ColorsManager.grayColor,
+                                          tilePadding:
+                                              const EdgeInsets.symmetric(
+                                                  horizontal: 6),
+                                          title: const BodySmall(
+                                              text: 'Automation'),
+                                          children: [
+                                            automationList.isNotEmpty
+                                                ? SceneGrid(
+                                                    scenes: automationList,
+                                                    loadingSceneId:
+                                                        state.loadingSceneId,
+                                                    disablePLayButton: true,
+                                                  )
+                                                : const Center(
+                                                    child: BodyMedium(
+                                                      text:
+                                                          'No automations have been added yet',
+                                                    ),
+                                                  ),
+                                            const SizedBox(
+                                              height: 10,
                                             ),
-                                      const SizedBox(
-                                        height: 10,
-                                      ),
-                                    ],
-                                  ),
-                                  const SizedBox(
-                                    height: 15,
-                                  ),
-                                ],
-                              ),
-                            );
+                                          ],
+                                        ),
+                                        const SizedBox(
+                                          height: 15,
+                                        ),
+                                      ],
+                                    ),
+                                  );
                           }
                           return const SizedBox();
                         },
diff --git a/lib/features/scene/widgets/if_then_containers/then_added_tasks.dart b/lib/features/scene/widgets/if_then_containers/then_added_tasks.dart
index 4c3f531..1e6384c 100644
--- a/lib/features/scene/widgets/if_then_containers/then_added_tasks.dart
+++ b/lib/features/scene/widgets/if_then_containers/then_added_tasks.dart
@@ -13,6 +13,7 @@ import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
 import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/helpers/snack_bar.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
 class ThenAddedTasksContainer extends StatelessWidget
@@ -146,9 +147,7 @@ class ThenAddedTasksContainer extends StatelessWidget
           String removeFunction =
               "${taskItem.operationName} with value ${taskItem.operationalValues.first.value}";
 
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text('$removeFunction removed')),
-          );
+          CustomSnackBar.displaySnackBar('$removeFunction removed');
         },
         child: SceneListTile(
           padding: EdgeInsets.zero,