diff --git a/lib/Screens/authentication/login/login_widget.dart b/lib/Screens/authentication/login/login_widget.dart
index 57da01b..31ce6c4 100644
--- a/lib/Screens/authentication/login/login_widget.dart
+++ b/lib/Screens/authentication/login/login_widget.dart
@@ -406,8 +406,10 @@ class _LoginWidgetState extends State<LoginWidget> {
     }
   }
 
-  void _clearAllFields() {
+  Future<void> _clearAllFields() async {
     print("CLEAR ALL Fields");
+    final prefs = await SharedPreferences.getInstance();
+    prefs.clear();
 
     _emailController.clear();
     _passwordController.clear();
diff --git a/lib/Screens/costCenter/costCenter_list.dart b/lib/Screens/costCenter/costCenter_list.dart
index 486a28c..1fdced1 100644
--- a/lib/Screens/costCenter/costCenter_list.dart
+++ b/lib/Screens/costCenter/costCenter_list.dart
@@ -78,16 +78,21 @@ class CostCenterListState extends State<CostCenterList> {
     if (!mounted) return;
     try {
       futureCostCenter = fetchGetCostCenter();
-
-      futureCostCenter?.then((object) {
-        setState(() {
-          allCostCenter = object;
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        futureCostCenter?.then((object) {
+          setState(() {
+            allCostCenter = object;
+          });
         });
-      });
 
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
-      });
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          loadInitialData();
+        });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/department/department_list.dart b/lib/Screens/department/department_list.dart
index e057313..13152d5 100644
--- a/lib/Screens/department/department_list.dart
+++ b/lib/Screens/department/department_list.dart
@@ -78,16 +78,21 @@ class DepartmentListState extends State<DepartmentList> {
     if (!mounted) return;
     try {
       futureDepartment = fetchGetDepartment();
-
-      futureDepartment?.then((object) {
-        setState(() {
-          allDepartment = object;
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        futureDepartment?.then((object) {
+          setState(() {
+            allDepartment = object;
+          });
         });
-      });
 
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
-      });
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          loadInitialData();
+        });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/group/group.dart b/lib/Screens/group/group.dart
index 7e51335..add0113 100644
--- a/lib/Screens/group/group.dart
+++ b/lib/Screens/group/group.dart
@@ -146,18 +146,23 @@ class _groupState extends State<Group> {
 
       orgId = await getOrgId();
       userId = await getUserId();
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        setState(() {
+          apiAllPolicy = result;
 
-      setState(() {
-        apiAllPolicy = result;
-
-        apiForDomestic =
-            result.where((policy) => policy["domestic"] == "1").toList();
-        apiForInternational =
-            result.where((policy) => policy["international"] == "1").toList();
-      });
-      print("Fetched services: $apiAllPolicy");
-      print("Domestic policies: $apiForDomestic");
-      print("International policies: $apiForInternational");
+          apiForDomestic =
+              result.where((policy) => policy["domestic"] == "1").toList();
+          apiForInternational =
+              result.where((policy) => policy["international"] == "1").toList();
+        });
+        print("Fetched services: $apiAllPolicy");
+        print("Domestic policies: $apiForDomestic");
+        print("International policies: $apiForInternational");
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print('Error fetching role list: $e');
     }
diff --git a/lib/Screens/group/groupDetails.dart b/lib/Screens/group/groupDetails.dart
index f4f9406..78ad4c7 100644
--- a/lib/Screens/group/groupDetails.dart
+++ b/lib/Screens/group/groupDetails.dart
@@ -180,15 +180,20 @@ class GroupDataState extends State<GroupData> {
       final result = await apiService.fetchAllPolicy(context);
 
       userId = await getUserId();
-
-      setState(() {
-        apiForDomestic =
-            result.where((policy) => policy["domestic"] == "1").toList();
-        apiForInternational =
-            result.where((policy) => policy["international"] == "1").toList();
-      });
-      print("Domestic policies: $apiForDomestic");
-      print("International policies: $apiForInternational");
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        setState(() {
+          apiForDomestic =
+              result.where((policy) => policy["domestic"] == "1").toList();
+          apiForInternational =
+              result.where((policy) => policy["international"] == "1").toList();
+        });
+        print("Domestic policies: $apiForDomestic");
+        print("International policies: $apiForInternational");
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print('Error fetching role list: $e');
     }
diff --git a/lib/Screens/group/groupList.dart b/lib/Screens/group/groupList.dart
index 1f5b17a..47b4b30 100644
--- a/lib/Screens/group/groupList.dart
+++ b/lib/Screens/group/groupList.dart
@@ -124,13 +124,19 @@ class _GroupListState extends State<GroupList> {
 
   Future<void> loadAllGroups() async {
     try {
-      final result = await apiService.fetchAllGroup(context);
-      setState(() {
-        allGroups = result;
-        filteredGroups = result;
-        searchController.text = "";
-      });
-      print("Fetched services: $allGroups");
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        final result = await apiService.fetchAllGroup(context);
+        setState(() {
+          allGroups = result;
+          filteredGroups = result;
+          searchController.text = "";
+        });
+        print("Fetched services: $allGroups");
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print('Error fetching role list: $e');
     }
diff --git a/lib/Screens/hotels/hotels_list.dart b/lib/Screens/hotels/hotels_list.dart
index c12d1d3..0cac456 100644
--- a/lib/Screens/hotels/hotels_list.dart
+++ b/lib/Screens/hotels/hotels_list.dart
@@ -82,17 +82,22 @@ class HotelsDataListState extends State<HotelsDataList> {
     if (!mounted) return;
     try {
       futureHotels = fetchGetHotels();
-
-      futureHotels?.then((objects) {
-        setState(() {
-          allHotels = objects;
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        futureHotels?.then((objects) {
+          setState(() {
+            allHotels = objects;
+          });
         });
-      });
 
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        fetchCountryList();
-        loadInitialData();
-      });
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          fetchCountryList();
+          loadInitialData();
+        });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/myTemplates/template.dart b/lib/Screens/myTemplates/template.dart
index 1625014..cb4c907 100644
--- a/lib/Screens/myTemplates/template.dart
+++ b/lib/Screens/myTemplates/template.dart
@@ -140,13 +140,19 @@ class TemplateState extends State<Template> {
     }
     if (!mounted) return;
     try {
-      for (var field in dataHeader) {
-        controllers[field] = TextEditingController();
-      }
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        for (var field in dataHeader) {
+          controllers[field] = TextEditingController();
+        }
 
-      updateData();
-      loadinitializeData();
-      loadInitialData();
+        updateData();
+        loadinitializeData();
+        loadInitialData();
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/myTemplates/templateForex.dart b/lib/Screens/myTemplates/templateForex.dart
index ee09cb9..2d38663 100644
--- a/lib/Screens/myTemplates/templateForex.dart
+++ b/lib/Screens/myTemplates/templateForex.dart
@@ -151,13 +151,19 @@ class TemplateForexState extends State<TemplateForex> {
     }
     if (!mounted) return;
     try {
-      for (var field in dataHeader) {
-        controllers[field] = TextEditingController();
-      }
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        for (var field in dataHeader) {
+          controllers[field] = TextEditingController();
+        }
 
-      updateData();
-      loadinitializeData();
-      loadInitialData();
+        updateData();
+        loadinitializeData();
+        loadInitialData();
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/myTemplates/templatesList.dart b/lib/Screens/myTemplates/templatesList.dart
index bcd6b6f..6f5a741 100644
--- a/lib/Screens/myTemplates/templatesList.dart
+++ b/lib/Screens/myTemplates/templatesList.dart
@@ -80,17 +80,22 @@ class TemplatesListState extends State<TemplatesList> {
     if (!mounted) return;
     try {
       futureTemplates = fetchGetForex();
-
-      futureTemplates?.then((users) {
-        setState(() {
-          allTemplate = users;
-          print("AlL tEMPLATESNIT - $allTemplate");
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        futureTemplates?.then((users) {
+          setState(() {
+            allTemplate = users;
+            print("AlL tEMPLATESNIT - $allTemplate");
+          });
         });
-      });
 
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
-      });
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          loadInitialData();
+        });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/organization/orgSetup.dart b/lib/Screens/organization/orgSetup.dart
index 5f3e5d6..37630e6 100644
--- a/lib/Screens/organization/orgSetup.dart
+++ b/lib/Screens/organization/orgSetup.dart
@@ -70,7 +70,7 @@ class _OrgSetUpState extends State<OrgSetUp> {
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -78,10 +78,14 @@ class _OrgSetUpState extends State<OrgSetUp> {
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
-    loadAllServices();
-    getOrganizationData();
-    initializeData();
-    loadInitialData();
+    if (roleUser != null && (roleUser == 'Org Admin')) {
+      loadAllServices();
+      getOrganizationData();
+      initializeData();
+      loadInitialData();
+    } else {
+      apiService.logout(context);
+    }
   }
 
   void loadInitialData() async {
diff --git a/lib/Screens/perdiem_amount/forex_list.dart b/lib/Screens/perdiem_amount/forex_list.dart
index 5caa029..5b3d7e7 100644
--- a/lib/Screens/perdiem_amount/forex_list.dart
+++ b/lib/Screens/perdiem_amount/forex_list.dart
@@ -81,17 +81,22 @@ class ForexDataListState extends State<ForexDataList> {
     if (!mounted) return;
     try {
       futureForex = fetchGetForex();
-
-      futureForex?.then((users) {
-        setState(() {
-          allForex = users;
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        futureForex?.then((users) {
+          setState(() {
+            allForex = users;
+          });
         });
-      });
 
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        fetchCountryList();
-        loadInitialData();
-      });
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          fetchCountryList();
+          loadInitialData();
+        });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/plans/create_plans.dart b/lib/Screens/plans/create_plans.dart
index c386c3f..05e9222 100644
--- a/lib/Screens/plans/create_plans.dart
+++ b/lib/Screens/plans/create_plans.dart
@@ -682,11 +682,19 @@ class CreateNewPlansState extends State<CreateNewPlan> {
   void handleUpdateData() {
     if (widget.selectedPlanData != null) {
       setState(() {
+        print("updatedPlanDAta - ${widget.selectedPlanData}");
         statusValue = widget.selectedPlanData['status_value'] ?? '';
 
         print("STATUS____ : $statusValue");
+        print("STATUSplanUsrId____ : ${widget.selectedPlanData['user_id']}");
+
+        planUsrId =
+            widget.selectedPlanData['user_id'] != '0'
+                ? widget.selectedPlanData['user_id']
+                : widget.selectedPlanData['traveller_id'];
+
+        print("STATUSplanUsrId____1 : $planUsrId");
 
-        planUsrId = widget.selectedPlanData['user_id'] ?? '';
         _tripTitleController.text = widget.selectedPlanData['trip_title'] ?? '';
         _descriptionController.text =
             widget.selectedPlanData['description'] ?? '';
@@ -1168,12 +1176,19 @@ class CreateNewPlansState extends State<CreateNewPlan> {
   }
 
   Future<void> fetchTrainFlightClass(int tripId) async {
+    // final userId =
+    //     (planUsrId?.toString().isNotEmpty == true)
+    //         ? planUsrId.toString()
+    //         : (planTravlrId?.toString().isNotEmpty == true)
+    //         ? planTravlrId.toString()
+    //         : '';
+
+    print("TfetchTrainFlightClass");
+
     final userId =
-        (planUsrId?.toString().isNotEmpty == true)
-            ? planUsrId.toString()
-            : (planTravlrId?.toString().isNotEmpty == true)
-            ? planTravlrId.toString()
-            : '';
+        (planUsrId?.toString().isNotEmpty == true) ? planUsrId.toString() : '';
+
+    print("TfetchTrainFlightClass - $userId");
 
     // final String apiUrldata = '$apiUrl/api/getDropdownMaster';
     final String apiUrldata =
diff --git a/lib/Screens/plans/list_plans.dart b/lib/Screens/plans/list_plans.dart
index fb2e865..fcf76ab 100644
--- a/lib/Screens/plans/list_plans.dart
+++ b/lib/Screens/plans/list_plans.dart
@@ -91,7 +91,18 @@ class _ListPlansState extends State<ListPlans> {
       if (!msUser) {
         _popStateListener = html.window.onPopState.listen((event) {
           if (!_dialogShown && mounted) {
-            _showBackConfirmationDialog();
+            print("locationLPw - 1");
+            print("locationLPw - ${html.window.location}");
+            final fullUrl = html.window.location.href;
+            final hashPart =
+                fullUrl.split('#/').last; // → "OrganizationSettings"
+
+            print("Current route: $hashPart");
+            if (hashPart.contains('/listPlan')) {
+              print("locationLPw - 2r");
+              _showBackConfirmationDialog();
+            }
+            print("locationLPw - 2");
           }
 
           // Re-push to prevent leaving
@@ -109,7 +120,7 @@ class _ListPlansState extends State<ListPlans> {
 
   void _showBackConfirmationDialog() {
     print('List planstt');
-    if (!mounted) return;
+    // if (!mounted) return;
 
     _dialogShown = true;
 
diff --git a/lib/Screens/policy/policy.dart b/lib/Screens/policy/policy.dart
index f064cec..71b1bba 100644
--- a/lib/Screens/policy/policy.dart
+++ b/lib/Screens/policy/policy.dart
@@ -187,31 +187,38 @@ class _PolicyState extends State<Policy> {
     }
     if (!mounted) return;
     try {
-      loadinitializeData();
+      final roleUser = await getRoleUser();
 
-      await updateSelectedServices();
-      updateData();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        loadinitializeData();
 
-      loadInitialData();
+        await updateSelectedServices();
+        updateData();
 
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (widget.policy != null) {
-          final details = List<Map<String, dynamic>>.from(
-            widget.policy!['policy_details'],
-          );
-          policyCriteriaKey.currentState?.loadPolicyDetails(details);
-        }
-      });
+        loadInitialData();
 
-      // if (widget.policy != null) {
-      //   print("185");
-      //   final details = List<Map<String, dynamic>>.from(
-      //     widget.policy!['policy_details'],
-      //   );
-      //   policyCriteriaKey.currentState?.loadPolicyDetails(details);
-      //
-      //   policyCriteriaKey.currentState?.fetchTrainFlightClass();
-      // }
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (widget.policy != null) {
+            final details = List<Map<String, dynamic>>.from(
+              widget.policy!['policy_details'],
+            );
+            policyCriteriaKey.currentState?.loadPolicyDetails(details);
+          }
+        });
+
+        // if (widget.policy != null) {
+        //   print("185");
+        //   final details = List<Map<String, dynamic>>.from(
+        //     widget.policy!['policy_details'],
+        //   );
+        //   policyCriteriaKey.currentState?.loadPolicyDetails(details);
+        //
+        //   policyCriteriaKey.currentState?.fetchTrainFlightClass();
+        // }
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/policy/policy_list.dart b/lib/Screens/policy/policy_list.dart
index 261ac76..c59ada4 100644
--- a/lib/Screens/policy/policy_list.dart
+++ b/lib/Screens/policy/policy_list.dart
@@ -74,16 +74,23 @@ class _PolicyListState extends State<PolicyList> {
     }
     if (!mounted) return;
     try {
-      futurePolicy = fetchPolicy();
+      final roleUser = await getRoleUser();
 
-      futurePolicy?.then((object) {
-        setState(() {
-          allPolicy = object;
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        futurePolicy = fetchPolicy();
+
+        futurePolicy?.then((object) {
+          setState(() {
+            allPolicy = object;
+          });
         });
-      });
 
-      loadInitialData();
-      fetchPolicy();
+        loadInitialData();
+        fetchPolicy();
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/purposeOfTravel/purpose_of_travel_list.dart b/lib/Screens/purposeOfTravel/purpose_of_travel_list.dart
index f2b872a..18cbcdf 100644
--- a/lib/Screens/purposeOfTravel/purpose_of_travel_list.dart
+++ b/lib/Screens/purposeOfTravel/purpose_of_travel_list.dart
@@ -79,15 +79,21 @@ class PurposeOfTravelListState extends State<PurposeOfTravelList> {
     try {
       futurePurposeOfTravel = fetchGetPurposeOfTravel();
 
-      futurePurposeOfTravel?.then((object) {
-        setState(() {
-          allPurposeOfTravel = object;
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        futurePurposeOfTravel?.then((object) {
+          setState(() {
+            allPurposeOfTravel = object;
+          });
         });
-      });
 
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
-      });
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          loadInitialData();
+        });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/reports/advancePurchase.dart b/lib/Screens/reports/advancePurchase.dart
index ba3de22..b17c6f5 100644
--- a/lib/Screens/reports/advancePurchase.dart
+++ b/lib/Screens/reports/advancePurchase.dart
@@ -185,7 +185,7 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -193,10 +193,17 @@ class _AdvancePurchaseState extends State<AdvancePurchase>
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+          loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("advance report : $e");
diff --git a/lib/Screens/reports/guestHouse.dart b/lib/Screens/reports/guestHouse.dart
index c01354d..b889b6f 100644
--- a/lib/Screens/reports/guestHouse.dart
+++ b/lib/Screens/reports/guestHouse.dart
@@ -149,7 +149,7 @@ class _GuestHouseState extends State<GuestHouse>
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -157,10 +157,17 @@ class _GuestHouseState extends State<GuestHouse>
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+          loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("guest report : $e");
diff --git a/lib/Screens/reports/misAir.dart b/lib/Screens/reports/misAir.dart
index 186c8fa..67bf655 100644
--- a/lib/Screens/reports/misAir.dart
+++ b/lib/Screens/reports/misAir.dart
@@ -150,7 +150,7 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -158,10 +158,17 @@ class _MISairState extends State<MISair> with SingleTickerProviderStateMixin {
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+          loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("Air report : $e");
diff --git a/lib/Screens/reports/misForex.dart b/lib/Screens/reports/misForex.dart
index 9d4e0a3..d9c8c21 100644
--- a/lib/Screens/reports/misForex.dart
+++ b/lib/Screens/reports/misForex.dart
@@ -120,7 +120,7 @@ class _MISforexState extends State<MISforex>
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -128,10 +128,17 @@ class _MISforexState extends State<MISforex>
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+          loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("Forex report : $e");
diff --git a/lib/Screens/reports/misHotel.dart b/lib/Screens/reports/misHotel.dart
index 5ad232a..21cab50 100644
--- a/lib/Screens/reports/misHotel.dart
+++ b/lib/Screens/reports/misHotel.dart
@@ -134,7 +134,7 @@ class _MIShotelState extends State<MIShotel>
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -142,10 +142,17 @@ class _MIShotelState extends State<MIShotel>
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+          loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("hotel report : $e");
diff --git a/lib/Screens/reports/reportList.dart b/lib/Screens/reports/reportList.dart
index 9a5164e..76894ef 100644
--- a/lib/Screens/reports/reportList.dart
+++ b/lib/Screens/reports/reportList.dart
@@ -47,7 +47,7 @@ class _ReportListState extends State<ReportList> {
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -55,10 +55,17 @@ class _ReportListState extends State<ReportList> {
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+    print('_checkAuthAndLoadDataSS - $roleUser');
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+          loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("service report : $e");
@@ -177,8 +184,8 @@ class _ReportListState extends State<ReportList> {
                             color: Colors.white,
                             child: InkWell(
                               onTap: () async {
-                                  final route = item['value'] as String;
-                                  context.go(route);
+                                final route = item['value'] as String;
+                                context.go(route);
                               },
                               child: Padding(
                                 padding: EdgeInsets.all(12),
diff --git a/lib/Screens/reports/servicesAnalysis.dart b/lib/Screens/reports/servicesAnalysis.dart
index 48f73d3..0b10a26 100644
--- a/lib/Screens/reports/servicesAnalysis.dart
+++ b/lib/Screens/reports/servicesAnalysis.dart
@@ -163,7 +163,7 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -171,10 +171,16 @@ class _ServicesAnalysisState extends State<ServicesAnalysis>
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     }
+
     if (!mounted) return;
     try {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
+        if (roleUser != null &&
+            (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+          loadInitialData();
+        } else {
+          apiService.logout(context);
+        }
       });
     } catch (e) {
       print("service report : $e");
diff --git a/lib/Screens/traveller/travellerList.dart b/lib/Screens/traveller/travellerList.dart
index e2bf8ea..11eaab6 100644
--- a/lib/Screens/traveller/travellerList.dart
+++ b/lib/Screens/traveller/travellerList.dart
@@ -78,16 +78,21 @@ class TravellerListState extends State<TravellerList> {
     if (!mounted) return;
     try {
       futureTraveller = fetchGetTraveller();
-
-      futureTraveller?.then((object) {
-        setState(() {
-          allTraveller = object;
+      final roleUser = await getRoleUser();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        futureTraveller?.then((object) {
+          setState(() {
+            allTraveller = object;
+          });
         });
-      });
 
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        loadInitialData();
-      });
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          loadInitialData();
+        });
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       print("group : $e");
     }
diff --git a/lib/Screens/userManagement/create_traveller_agent/createTravelAgent.dart b/lib/Screens/userManagement/create_traveller_agent/createTravelAgent.dart
index 9f6df68..2034d61 100644
--- a/lib/Screens/userManagement/create_traveller_agent/createTravelAgent.dart
+++ b/lib/Screens/userManagement/create_traveller_agent/createTravelAgent.dart
@@ -355,6 +355,7 @@ class _CreateTravelAgentFormDetialsState
   }
 
   void _checkAuthAndLoadData() async {
+    final roleUser = await getRoleUser();
     setState(() {
       isCheckingToken = true;
     });
@@ -367,44 +368,50 @@ class _CreateTravelAgentFormDetialsState
       return;
     }
 
-    setState(() {
-      isCheckingToken = false;
-    });
+    if (roleUser != null &&
+        (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+      setState(() {
+        isCheckingToken = false;
+      });
 
-    prepareForNewEntry();
-    selectedTab = "personal";
+      prepareForNewEntry();
+      selectedTab = "personal";
 
-    apiCountryData = null;
-    apiUserData = null;
-    apiCostData = null;
-    apiRoleData = null;
+      apiCountryData = null;
+      apiUserData = null;
+      apiCostData = null;
+      apiRoleData = null;
 
-    for (var field in dataHeader) {
-      controllers[field] = TextEditingController();
-    }
-
-    /// ✅ Now this is safe here
-    try {
-      final extraData = GoRouterState.of(context).extra;
-      if (extraData != null && extraData is Map<String, dynamic>) {
-        setState(() {
-          apiselectedUser = extraData['selectedUser'] as Map<String, dynamic>?;
-          isViewMode = extraData['isViewMode'] ?? false;
-          isEditProfile = extraData['isEditProfile'] ?? false;
-        });
-        updateData();
+      for (var field in dataHeader) {
+        controllers[field] = TextEditingController();
       }
-    } catch (e) {
-      print("Router extra error: $e");
-    }
 
-    // Final async data fetches
-    initializeData();
-    fetchCountries();
-    fetchDepartment();
-    fetchUsers();
-    fetchRoles();
-    loadInitialData();
+      /// ✅ Now this is safe here
+      try {
+        final extraData = GoRouterState.of(context).extra;
+        if (extraData != null && extraData is Map<String, dynamic>) {
+          setState(() {
+            apiselectedUser =
+                extraData['selectedUser'] as Map<String, dynamic>?;
+            isViewMode = extraData['isViewMode'] ?? false;
+            isEditProfile = extraData['isEditProfile'] ?? false;
+          });
+          updateData();
+        }
+      } catch (e) {
+        print("Router extra error: $e");
+      }
+
+      // Final async data fetches
+      initializeData();
+      fetchCountries();
+      fetchDepartment();
+      fetchUsers();
+      fetchRoles();
+      loadInitialData();
+    } else {
+      apiService.logout(context);
+    }
   }
 
   void _checkAuthAndLoadData22() async {
diff --git a/lib/Screens/userManagement/create_traveller_agent/listTravelAgent.dart b/lib/Screens/userManagement/create_traveller_agent/listTravelAgent.dart
index 1188dcd..b0150ad 100644
--- a/lib/Screens/userManagement/create_traveller_agent/listTravelAgent.dart
+++ b/lib/Screens/userManagement/create_traveller_agent/listTravelAgent.dart
@@ -66,7 +66,7 @@ class _TravelAgentListScreenState extends State<TravelAgentListScreen> {
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -75,18 +75,22 @@ class _TravelAgentListScreenState extends State<TravelAgentListScreen> {
       return;
     } else {
       futureUsers = fetchUsers();
-
-      futureUsers.then((users) {
-        setState(() {
-          allUsers = users;
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        futureUsers.then((users) {
+          setState(() {
+            allUsers = users;
+          });
         });
-      });
-      fetchCountryList();
-      loadInitialData();
-      // WidgetsBinding.instance.addPostFrameCallback((_) {
-      //   fetchCountryList();
-      //   loadInitialData();
-      // });
+        fetchCountryList();
+        loadInitialData();
+        // WidgetsBinding.instance.addPostFrameCallback((_) {
+        //   fetchCountryList();
+        //   loadInitialData();
+        // });
+      } else {
+        apiService.logout(context);
+      }
     }
   }
 
diff --git a/lib/Screens/userManagement/create_user/create_user.dart b/lib/Screens/userManagement/create_user/create_user.dart
index 1e5b9e6..8cdf68d 100644
--- a/lib/Screens/userManagement/create_user/create_user.dart
+++ b/lib/Screens/userManagement/create_user/create_user.dart
@@ -445,6 +445,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
   }
 
   void _checkAuthAndLoadData() async {
+    final roleUser = await getRoleUser();
     setState(() {
       isCheckingToken = true;
     });
@@ -457,44 +458,50 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
       return;
     }
 
-    setState(() {
-      isCheckingToken = false;
-    });
+    if (roleUser != null &&
+        (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+      setState(() {
+        isCheckingToken = false;
+      });
 
-    prepareForNewEntry();
-    selectedTab = "personal";
+      prepareForNewEntry();
+      selectedTab = "personal";
 
-    apiCountryData = null;
-    apiUserData = null;
-    apiCostData = null;
-    apiRoleData = null;
+      apiCountryData = null;
+      apiUserData = null;
+      apiCostData = null;
+      apiRoleData = null;
 
-    for (var field in dataHeader) {
-      controllers[field] = TextEditingController();
-    }
-
-    /// ✅ Now this is safe here
-    try {
-      final extraData = GoRouterState.of(context).extra;
-      if (extraData != null && extraData is Map<String, dynamic>) {
-        setState(() {
-          apiselectedUser = extraData['selectedUser'] as Map<String, dynamic>?;
-          isViewMode = extraData['isViewMode'] ?? false;
-          isEditProfile = extraData['isEditProfile'] ?? false;
-        });
-        updateData();
+      for (var field in dataHeader) {
+        controllers[field] = TextEditingController();
       }
-    } catch (e) {
-      print("Router extra error: $e");
-    }
 
-    // Final async data fetches
-    initializeData();
-    fetchCountries();
-    fetchDepartment();
-    fetchUsers();
-    fetchRoles();
-    loadInitialData();
+      /// ✅ Now this is safe here
+      try {
+        final extraData = GoRouterState.of(context).extra;
+        if (extraData != null && extraData is Map<String, dynamic>) {
+          setState(() {
+            apiselectedUser =
+                extraData['selectedUser'] as Map<String, dynamic>?;
+            isViewMode = extraData['isViewMode'] ?? false;
+            isEditProfile = extraData['isEditProfile'] ?? false;
+          });
+          updateData();
+        }
+      } catch (e) {
+        print("Router extra error: $e");
+      }
+
+      // Final async data fetches
+      initializeData();
+      fetchCountries();
+      fetchDepartment();
+      fetchUsers();
+      fetchRoles();
+      loadInitialData();
+    } else {
+      apiService.logout(context);
+    }
   }
 
   void _checkAuthAndLoadData22() async {
diff --git a/lib/Screens/userManagement/create_user/traveller_details.dart b/lib/Screens/userManagement/create_user/traveller_details.dart
index 1786bdc..6941526 100644
--- a/lib/Screens/userManagement/create_user/traveller_details.dart
+++ b/lib/Screens/userManagement/create_user/traveller_details.dart
@@ -1347,7 +1347,7 @@ class TravellerDetailsState extends State<TravellerDetails> {
     List<String> nationalityOptions = [
       "Indian",
       "International",
-      "other nationality",
+      "Other Nationality",
     ];
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/lib/Screens/userManagement/user_List.dart b/lib/Screens/userManagement/user_List.dart
index 79eca80..36ba8ea 100644
--- a/lib/Screens/userManagement/user_List.dart
+++ b/lib/Screens/userManagement/user_List.dart
@@ -51,7 +51,7 @@ class _UserListScreenState extends State<UserListScreen> {
   @override
   void initState() {
     super.initState();
-    // futureUsers = fetchUsers();
+    futureUsers = fetchUsers();
     //
     // futureUsers.then((users) {
     //   setState(() {
@@ -63,12 +63,13 @@ class _UserListScreenState extends State<UserListScreen> {
     //   fetchCountryList();
     //   loadInitialData();
     // });
+
     _checkAuthAndLoadData();
   }
 
   void _checkAuthAndLoadData() async {
     final String? token = await getToken(); // Your async function to get token
-
+    final roleUser = await getRoleUser();
     if (token == null || token.isEmpty) {
       // Token doesn't exist → redirect to login
       context.go(
@@ -76,15 +77,20 @@ class _UserListScreenState extends State<UserListScreen> {
       ); // or use: router.go("/") if you're using `GoRouter` directly
       return;
     } else {
-      futureUsers = fetchUsers();
+      if (roleUser != null &&
+          (roleUser == 'Org Admin' || roleUser == 'Travel Admin')) {
+        futureUsers = fetchUsers();
 
-      futureUsers.then((users) {
-        setState(() {
-          allUsers = users;
+        futureUsers.then((users) {
+          setState(() {
+            allUsers = users;
+          });
         });
-      });
-      fetchCountryList();
-      loadInitialData();
+        fetchCountryList();
+        loadInitialData();
+      } else {
+        apiService.logout(context);
+      }
       // WidgetsBinding.instance.addPostFrameCallback((_) {
       //   fetchCountryList();
       //   loadInitialData();
diff --git a/lib/app.dart b/lib/app.dart
index f577969..f751e69 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -35,8 +35,8 @@ class _MyAppState extends State<MyApp> {
   void initState() {
     super.initState();
 
-    // SemanticsBinding.instance
-    //     .ensureSemantics(); //  -only for testing uncomment, Otherwise Email Template wont allow to type
+    SemanticsBinding.instance
+        .ensureSemantics(); //  -NOTE:only for testing uncomment, Otherwise Email Template wont allow to type
     if (kIsWeb) {
       final uri = Uri.parse(html.window.location.href);
       print("URI - $uri");
diff --git a/lib/services/apiService.dart b/lib/services/apiService.dart
index 0854527..e0d1a22 100644
--- a/lib/services/apiService.dart
+++ b/lib/services/apiService.dart
@@ -893,7 +893,7 @@ class ApiService {
   }) async {
     try {
       Map<String, dynamic> planData = await getViewPlanEdit(planId, context);
-      print("ViewAAA - $planData");
+      print("ViewAAA API Service - $planData");
 
       context.go(
         isMyTrips ? '/createPlan' : '/allTrips/trips',
diff --git a/lib/utils/travelAgent_remarks.dart b/lib/utils/travelAgent_remarks.dart
index 93b99a0..815d615 100644
--- a/lib/utils/travelAgent_remarks.dart
+++ b/lib/utils/travelAgent_remarks.dart
@@ -83,15 +83,19 @@ class CommentModalState extends State<CommentModal> {
         throw Exception('Invalid user ID format.');
       }
 
-      final data = await getRemarks(userId);
+      if (role != null && (role == 'Org Admin' || role == 'Travel Admin')) {
+        final data = await getRemarks(userId);
 
-      setState(() {
-        remarksData = data;
+        setState(() {
+          remarksData = data;
 
-        isLoading = false;
-      });
-      print("Remarks -");
-      print("Remarks - ${jsonEncode(remarksData)}");
+          isLoading = false;
+        });
+        print("Remarks -");
+        print("Remarks - ${jsonEncode(remarksData)}");
+      } else {
+        apiService.logout(context);
+      }
     } catch (e) {
       setState(() {
         errorMessage = e.toString();
@@ -203,12 +207,12 @@ class CommentModalState extends State<CommentModal> {
       if (response.statusCode == 200) {
         print("Plan submitted successfully!");
         print("Response: ${response.body}");
-      }  else if (response.statusCode == 403) {
+      } else if (response.statusCode == 403) {
         print("403-FORB");
         await apiService.logout(context);
         return null;
         // throw Exception('Failed to load users');
-      }else {
+      } else {
         print("Failed to submit plan. Status: ${response.statusCode}");
         print("Error: ${response.body}");
       }