diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000..ccb7885
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,16 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "gnu18",
+            "cppStandard": "gnu++14",
+            "intelliSenseMode": "gcc-x64"
+        }
+    ],
+    "version": 4
+}
\ No newline at end of file
diff --git a/lib/MyApp.dart b/lib/MyApp.dart
index 562c26d..b9f47e1 100644
--- a/lib/MyApp.dart
+++ b/lib/MyApp.dart
@@ -28,8 +28,8 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:share/share.dart';
+import 'package:double_back_to_close_app/double_back_to_close_app.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-
 import 'pages/EventsPage/BookmarksPage.dart';
 import 'pages/HomePage/PostDetailsPage.dart';
 import 'package:onesignal_flutter/onesignal_flutter.dart';
@@ -273,8 +273,16 @@ class _MyHomePageState extends State<MyHomePage> {
                               child: isAv
                                   ? SvgPicture.network(
                                       url,
-                                      height:  (640 / MediaQuery.of(context).size.height) * 100,
-                                      width: (360 / MediaQuery.of(context).size.height) * 100,
+                                      height: (640 /
+                                              MediaQuery.of(context)
+                                                  .size
+                                                  .height) *
+                                          100,
+                                      width: (360 /
+                                              MediaQuery.of(context)
+                                                  .size
+                                                  .height) *
+                                          100,
                                       alignment: Alignment.topLeft,
                                     )
                                   : InitialNameAvatar(
@@ -481,7 +489,12 @@ class _MyHomePageState extends State<MyHomePage> {
           : null,
       extendBody: true,
       backgroundColor: DynamicTheme.of(context).data.scaffoldBackgroundColor,
-      body: _tabs[indexState.bottomNavIndex],
+      body: DoubleBackToCloseApp(
+        child: _tabs[indexState.bottomNavIndex],
+        snackBar: const SnackBar(
+          content: Text('Tap back again to leave'),
+        ),
+      ),
       bottomNavigationBar: BottomNav(),
     );
   }
diff --git a/lib/pages/attendancePages/sapCredForm.dart b/lib/pages/attendancePages/sapCredForm.dart
index 2fd070e..d5ac3bc 100644
--- a/lib/pages/attendancePages/sapCredForm.dart
+++ b/lib/pages/attendancePages/sapCredForm.dart
@@ -102,12 +102,13 @@ class _SapCredFormState extends State<SapCredForm> {
                           _prefs.setString("password", password);
                           _prefs.setString("roll", rollsave);
 
-                          Navigator.pushReplacement(
+                          Navigator.push(
                             context,
                             MaterialPageRoute(
                               builder: (_) => AttendanceMainPage(),
                             ),
                           );
+                          // AttendanceMainPage();
                         }),
                     SizedBox(height: 10),
                   ],
diff --git a/pubspec.yaml b/pubspec.yaml
index 00ded08..30a9e0b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -8,39 +8,40 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_svg: ^0.18.1
-  provider: ^4.0.2
-  flutter_staggered_grid_view: ^0.3.0
-  url_launcher: ^5.5.0
-  shared_preferences: ^0.5.4+6
-  google_maps_flutter: ^0.5.11
-  geolocator: ^5.1.4+2
-  permission_handler: null
+  cached_network_image: null
   cloud_firestore: ^0.13.0+1
   connectivity: ^0.4.6+2
-  location: null
-  transparent_image: ^1.0.0
-  cached_network_image: null
+  curved_navigation_bar: ^0.3.2
+  day_night_switcher: null
+  double_back_to_close_app: ^1.2.0
   dynamic_theme: null
-  intl: null
-  sqflite: null
-  flare_flutter: null
   firebase_auth: null
   firebase_dynamic_links: ^0.5.1
-  share: ^0.6.4+3
-  day_night_switcher: null
-  webview_flutter: null
-  fluttertoast: null
   fl_chart: ^0.11.1
+  flare_flutter: null
   flutter_bcrypt: null
   flutter_email_sender: null
-  curved_navigation_bar: ^0.3.2
+  flutter_staggered_grid_view: ^0.3.0
+  flutter_svg: ^0.18.1
+  fluttertoast: null
+  geolocator: ^5.1.4+2
+  google_maps_flutter: ^0.5.11
+  intl: null
+  location: null
   onesignal_flutter: ^2.6.1
+  permission_handler: null
+  provider: ^4.0.2
+  share: ^0.6.4+3
+  shared_preferences: ^0.5.4+6
+  sqflite: null
+  transparent_image: ^1.0.0
+  url_launcher: ^5.5.0
+  webview_flutter: null
 
 dev_dependencies:
-  flutter_launcher_icons: ^0.7.4
   flutter_test:
     sdk: flutter
+  flutter_launcher_icons: ^0.7.4
 
 flutter_icons:
   android: true