diff --git a/assets/app_tour/leftDown2.png b/assets/app_tour/leftDown2.png
new file mode 100644
index 00000000..52a624af
Binary files /dev/null and b/assets/app_tour/leftDown2.png differ
diff --git a/assets/app_tour/rightDown.png b/assets/app_tour/rightDown.png
new file mode 100644
index 00000000..07fa888b
Binary files /dev/null and b/assets/app_tour/rightDown.png differ
diff --git a/lib/presentation/Screens/auth_verification/create_new_pw.dart b/lib/presentation/Screens/auth_verification/create_new_pw.dart
index a973f8ed..3f0d5f16 100644
--- a/lib/presentation/Screens/auth_verification/create_new_pw.dart
+++ b/lib/presentation/Screens/auth_verification/create_new_pw.dart
@@ -179,7 +179,6 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
           SnackBar(
             content: Text(
                 AppLocalizations.of(context)!.password_update_successfully),
-            backgroundColor: Colors.green,
           ),
         );
 
@@ -676,7 +675,7 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
         mainAxisAlignment: MainAxisAlignment.center,
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
-          SizedBox(height: screenHeight / 8),
+          SizedBox(height: screenHeight * 0.21),
           Icon(Icons.check_circle_outlined, color: Color(0xFF8AC681), size: 80),
           SizedBox(height: 20),
           Text(
@@ -743,7 +742,7 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
               ],
             ),
           ),
-          SizedBox(height: screenHeight / 2.2),
+          SizedBox(height: screenHeight*0.25),
           // Spacer(),
           Center(
             // child: Container(
diff --git a/lib/presentation/Screens/charts/screens/chart_screen.dart b/lib/presentation/Screens/charts/screens/chart_screen.dart
index fe546771..b297195c 100644
--- a/lib/presentation/Screens/charts/screens/chart_screen.dart
+++ b/lib/presentation/Screens/charts/screens/chart_screen.dart
@@ -518,7 +518,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
     }
   }
 
-  void _previousKpiTutorial() {
+  Future<void> _previousKpiTutorial() async {
+    tourCard = (await _getWidget())!;
     _initpreviousTargets();
     tutorialCoachMark = TutorialCoachMark(
       paddingFocus: 0,
diff --git a/lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart b/lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart
index 7e33e008..f3ad0035 100644
--- a/lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart	
+++ b/lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart	
@@ -166,7 +166,7 @@ class _ManageUserRouterState extends ConsumerState<ManageUserRouter> {
   }
 
   //Method to show a confirmation dialog when status is changed
-  Future<void> _showConfirmationDialog(User user, String newStatus) async {
+  Future<void> _showConfirmationDialog(User user, String newStatus,String statusUpdate) async {
     print('user $user');
     double myheight = MediaQuery.of(context).size.height;
 
@@ -199,7 +199,7 @@ class _ManageUserRouterState extends ConsumerState<ManageUserRouter> {
                         ),
                         children: [
                           TextSpan(
-                            text: newStatus,
+                            text: statusUpdate,
                             style: TextStyle(
                               fontWeight:
                                   FontWeight.bold, // Makes newStatus bold
@@ -573,7 +573,7 @@ class _ManageUserRouterState extends ConsumerState<ManageUserRouter> {
                                                     print(user);
                                                     if (newStatus != null) {
                                                       _showConfirmationDialog(
-                                                          user, newStatus);
+                                                          user, newStatus, statusOptions[newStatus]!,);
                                                     }
                                                   },
                                                 ),
diff --git a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
index 4dcf04d8..2b29eb5b 100644
--- a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
+++ b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
@@ -298,8 +298,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
           createTargetContent(
             text: AppLocalizations.of(context)!.mainMenu,
             alignment: ContentAlign.bottom,
+            space:55,
             gap: 55,
-            space: locale.languageCode == 'ar' ? 20 : 20,
           ),
           TargetContent(
             align: ContentAlign.bottom,
@@ -416,7 +416,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
           TargetContent(
             padding: EdgeInsets.only(
               right: locale.languageCode == 'ar' ? 0 : screenWidth * 0.7,
-              top: locale.languageCode == 'ar' ? 20 : 20,
+              top: 25,
               left: locale.languageCode == 'ar' ? screenWidth * 0.7 : 0,
             ),
             align: locale.languageCode == 'ar'
@@ -424,13 +424,13 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
                 : ContentAlign.right,
             child: Container(
               width: 200,
-              height: screenHeight / 4,
+              height: 100,
               child: Stack(
                 children: [
                   Image.asset(
                     locale.languageCode == 'ar'
-                        ? 'assets/app_tour/down_right.png' // Arabic locale image
-                        : 'assets/app_tour/leftDown.png', // Default image
+                        ? 'assets/app_tour/rightDown.png' // Arabic locale image
+                        : 'assets/app_tour/leftDown2.png', // Default image
                     fit: BoxFit.contain,
                   ),
                   // Positioned(
@@ -461,7 +461,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
         contents: [
           createTargetContent(
             text: AppLocalizations.of(context)!.toggle,
-            space: 0,
+            space: 50,
             alignment: ContentAlign.bottom,
             gap: 50,
           ),
@@ -596,13 +596,13 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
                 : ContentAlign.left,
             child: Container(
               width: 200,
-              height: screenHeight / 4,
+              height: 200,
               child: Stack(
                 children: [
                   Image.asset(
                     locale.languageCode == 'ar'
-                        ? 'assets/app_tour/leftDown.png' // Arabic locale image
-                        : 'assets/app_tour/down_right.png', // Default image
+                        ? 'assets/app_tour/leftDown2.png' // Arabic locale image
+                        : 'assets/app_tour/rightDown.png', // Default image
                     fit: BoxFit.contain,
                   )
                 ],