diff --git a/lib/features/app_layout/view/widgets/app_bar_home_dropdown.dart b/lib/features/app_layout/view/widgets/app_bar_home_dropdown.dart
index 197893a..4fc6965 100644
--- a/lib/features/app_layout/view/widgets/app_bar_home_dropdown.dart
+++ b/lib/features/app_layout/view/widgets/app_bar_home_dropdown.dart
@@ -3,11 +3,10 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.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/resource_manager/color_manager.dart';
 
-import '../../../../generated/assets.dart';
-
 class AppBarHomeDropdown extends StatelessWidget {
   const AppBarHomeDropdown({super.key});
 
diff --git a/lib/features/devices/view/widgets/ACs/ac_interface_controls.dart b/lib/features/devices/view/widgets/ACs/ac_interface_controls.dart
index 0714bc1..9d39be6 100644
--- a/lib/features/devices/view/widgets/ACs/ac_interface_controls.dart
+++ b/lib/features/devices/view/widgets/ACs/ac_interface_controls.dart
@@ -5,8 +5,7 @@ import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_mode_control_unit.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
-
-import '../../../../../generated/assets.dart';
+import 'package:syncrow_app/generated/assets.dart';
 
 class AcInterfaceControls extends StatelessWidget {
   const AcInterfaceControls({
diff --git a/lib/features/devices/view/widgets/ACs/category_view_app_bar.dart b/lib/features/devices/view/widgets/ACs/category_view_app_bar.dart
index 4213086..f543407 100644
--- a/lib/features/devices/view/widgets/ACs/category_view_app_bar.dart
+++ b/lib/features/devices/view/widgets/ACs/category_view_app_bar.dart
@@ -2,10 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/display_medium.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 
-import '../../../../../utils/resource_manager/color_manager.dart';
-
 class CategoryViewAppBar extends StatelessWidget
     implements PreferredSizeWidget {
   const CategoryViewAppBar({
diff --git a/lib/features/devices/view/widgets/devices_view_body.dart b/lib/features/devices/view/widgets/devices_view_body.dart
index 5b3f9f4..6edb972 100644
--- a/lib/features/devices/view/widgets/devices_view_body.dart
+++ b/lib/features/devices/view/widgets/devices_view_body.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:smooth_page_indicator/smooth_page_indicator.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/view/widgets/devices_view_header.dart';
 import 'package:syncrow_app/features/devices/view/widgets/room_page.dart';
 import 'package:syncrow_app/features/devices/view/widgets/rooms_slider.dart';
@@ -9,8 +10,6 @@ import 'package:syncrow_app/features/devices/view/widgets/wizard_page.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 
-import '../../bloc/devices_cubit.dart';
-
 class DevicesViewBody extends StatelessWidget {
   const DevicesViewBody({
     super.key,
diff --git a/lib/features/devices/view/widgets/lights/light_interface_switch.dart b/lib/features/devices/view/widgets/lights/light_interface_switch.dart
index 938d772..7defc52 100644
--- a/lib/features/devices/view/widgets/lights/light_interface_switch.dart
+++ b/lib/features/devices/view/widgets/lights/light_interface_switch.dart
@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/strings_manager.dart';
 
-import '../../../../shared_widgets/default_container.dart';
-
 class LightInterfaceSwitch extends StatelessWidget {
   const LightInterfaceSwitch({
     super.key,
diff --git a/lib/features/devices/view/widgets/lights/lights_list.dart b/lib/features/devices/view/widgets/lights/lights_list.dart
index 7d4f164..ec675d7 100644
--- a/lib/features/devices/view/widgets/lights/lights_list.dart
+++ b/lib/features/devices/view/widgets/lights/lights_list.dart
@@ -2,9 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/lights/light_brightness.dart';
-
-import '../../../../shared_widgets/devices_default_switch.dart';
-import '../../../../shared_widgets/text_widgets/body_small.dart';
+import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 
 class LightsList extends StatelessWidget {
   const LightsList({
diff --git a/lib/features/devices/view/widgets/lights/lights_view_list.dart b/lib/features/devices/view/widgets/lights/lights_view_list.dart
index 2348dd1..25a3795 100644
--- a/lib/features/devices/view/widgets/lights/lights_view_list.dart
+++ b/lib/features/devices/view/widgets/lights/lights_view_list.dart
@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/lights/lights_list.dart';
+import 'package:syncrow_app/features/devices/view/widgets/universal_switch.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 
-import '../../../../shared_widgets/text_widgets/body_small.dart';
-import '../../../bloc/devices_cubit.dart';
-import '../universal_switch.dart';
-
 class LightsViewList extends StatelessWidget {
   const LightsViewList({
     super.key,
diff --git a/lib/features/devices/view/widgets/universal_switch.dart b/lib/features/devices/view/widgets/universal_switch.dart
index 1746ffc..9112514 100644
--- a/lib/features/devices/view/widgets/universal_switch.dart
+++ b/lib/features/devices/view/widgets/universal_switch.dart
@@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/device_category_model.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/strings_manager.dart';
 
-import '../../../../utils/resource_manager/color_manager.dart';
-import '../../../shared_widgets/text_widgets/body_medium.dart';
-
 class UniversalSwitch extends StatelessWidget {
   const UniversalSwitch({
     super.key,
diff --git a/lib/features/devices/view/widgets/wizard_switches.dart b/lib/features/devices/view/widgets/wizard_switches.dart
index 7d5de2b..a00d19a 100644
--- a/lib/features/devices/view/widgets/wizard_switches.dart
+++ b/lib/features/devices/view/widgets/wizard_switches.dart
@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/helpers/custom_page_route.dart';
 
-import '../../bloc/devices_cubit.dart';
-
 class WizartSwitches extends StatelessWidget {
   const WizartSwitches({
     super.key,
diff --git a/lib/features/menu/bloc/menu_cubit.dart b/lib/features/menu/bloc/menu_cubit.dart
index 56a8714..89ece3f 100644
--- a/lib/features/menu/bloc/menu_cubit.dart
+++ b/lib/features/menu/bloc/menu_cubit.dart
@@ -1,7 +1,6 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../model/list_item_model.dart';
-import '../model/menu_list_model.dart';
+import 'package:syncrow_app/features/menu/model/list_item_model.dart';
+import 'package:syncrow_app/features/menu/model/menu_list_model.dart';
 
 part 'menu_state.dart';
 
diff --git a/lib/features/menu/view/widgets/profile_tab.dart b/lib/features/menu/view/widgets/profile_tab.dart
index 16dc836..bfc7a16 100644
--- a/lib/features/menu/view/widgets/profile_tab.dart
+++ b/lib/features/menu/view/widgets/profile_tab.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
+import 'package:syncrow_app/features/shared_widgets/syncrow_logo.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 
-import '../../../shared_widgets/syncrow_logo.dart';
-
 class ProfileTab extends StatelessWidget {
   const ProfileTab({
     super.key,
diff --git a/lib/features/shared_widgets/devices_default_switch.dart b/lib/features/shared_widgets/devices_default_switch.dart
index 50a58b6..80511d8 100644
--- a/lib/features/shared_widgets/devices_default_switch.dart
+++ b/lib/features/shared_widgets/devices_default_switch.dart
@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
-import '../devices/bloc/devices_cubit.dart';
-
 class DevicesDefaultSwitch extends StatelessWidget {
   const DevicesDefaultSwitch({
     super.key,
diff --git a/lib/services/api/network_exception.dart b/lib/services/api/network_exception.dart
index 36b9f9f..f8940de 100644
--- a/lib/services/api/network_exception.dart
+++ b/lib/services/api/network_exception.dart
@@ -31,8 +31,8 @@ class ServerFailure extends Failure {
         {
           // var document = parser.parse(dioError.response!.data.toString());
           // var message = document.body!.text;
-          return ServerFailure.fromResponse(
-              dioError.response!.statusCode!, dioError.response!.data['message']
+          return ServerFailure.fromResponse(dioError.response!.statusCode!,
+              dioError.response!.data['message'].toString()
               // message
               );
         }