diff --git a/.vscode/launch.json b/.vscode/launch.json
index ecd784a..e64ae76 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,6 +11,12 @@
             "type": "dart",
             "deviceId": "0147FC23-3D6C-406A-BE2C-9E67BAF3DA9B"
         },
+        {
+            "name": "Iphone 15 Pro",
+            "request": "launch",
+            "type": "dart",
+            "deviceId": "9C9E6EEF-0E9C-4FA9-B201-CBA8AFB0D1D8"
+        },
         {
             "name": "Iphone SE",
             "request": "launch",
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b9..60df464 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Apr 03 23:37:40 EET 2024
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/lib/features/app_layout/view/app_layout.dart b/lib/features/app_layout/view/app_layout.dart
index d266660..6fbdb42 100644
--- a/lib/features/app_layout/view/app_layout.dart
+++ b/lib/features/app_layout/view/app_layout.dart
@@ -35,31 +35,27 @@ class AppLayout extends StatelessWidget {
               statusBarIconBrightness: Brightness.light,
             ),
             child: SafeArea(
-              child: BlocBuilder<HomeCubit, HomeState>(
-                builder: (context, state) {
-                  return Scaffold(
-                    backgroundColor: ColorsManager.backgroundColor,
-                    extendBodyBehindAppBar: true,
-                    extendBody: true,
-                    appBar: HomeCubit.getInstance().spaces != null
-                        ? const DefaultAppBar()
-                        : null,
-                    body: const AppBody(),
-                    bottomNavigationBar: const DefaultNavBar(),
-                    // floatingActionButton: FloatingActionButton(
-                    //   onPressed: () {
-                    //     Navigator.push(
-                    //       context,
-                    //       CustomPageRoute(
-                    //         builder: (context) =>
-                    //             const ThreeGangSwitchesView(),
-                    //       ),
-                    //     );
-                    //   },
-                    //   child: const Icon(Icons.arrow_forward_ios_sharp),
-                    // ),
-                  );
-                },
+              child: Scaffold(
+                backgroundColor: ColorsManager.backgroundColor,
+                extendBodyBehindAppBar: true,
+                extendBody: true,
+                appBar: HomeCubit.getInstance().spaces != null
+                    ? const DefaultAppBar()
+                    : null,
+                body: const AppBody(),
+                bottomNavigationBar: const DefaultNavBar(),
+                // floatingActionButton: FloatingActionButton(
+                //   onPressed: () {
+                //     Navigator.push(
+                //       context,
+                //       CustomPageRoute(
+                //         builder: (context) =>
+                //             const ThreeGangSwitchesView(),
+                //       ),
+                //     );
+                //   },
+                //   child: const Icon(Icons.arrow_forward_ios_sharp),
+                // ),
               ),
             ),
           );
diff --git a/lib/features/devices/bloc/devices_cubit.dart b/lib/features/devices/bloc/devices_cubit.dart
index 6449d93..d26659d 100644
--- a/lib/features/devices/bloc/devices_cubit.dart
+++ b/lib/features/devices/bloc/devices_cubit.dart
@@ -24,6 +24,7 @@ part 'devices_state.dart';
 
 class DevicesCubit extends Cubit<DevicesState> {
   DevicesCubit._() : super(DevicesInitial()) {
+    print('device cubit created');
     if (HomeCubit.getInstance().selectedSpace != null) {
       fetchGroups(HomeCubit.getInstance().selectedSpace!.id!);
       for (var room in HomeCubit.getInstance().selectedSpace!.rooms!) {
@@ -35,9 +36,9 @@ class DevicesCubit extends Cubit<DevicesState> {
 
   static DevicesCubit? _instance;
   static DevicesCubit getInstance() {
-    // If an instance already exists, return it
-    _instance ??= DevicesCubit._();
-    return _instance!;
+    print('device cubit instance found : ${_instance != null}');
+    print('selected space : ${HomeCubit.getInstance().selectedSpace != null}');
+    return _instance ??= DevicesCubit._();
   }
 
   DeviceModel? selectedDevice;