diff --git a/bus_tracking/android/app/src/main/res/drawable/background.xml b/bus_tracking/android/app/src/main/res/drawable/background.xml
new file mode 100644
index 0000000..4db182b
--- /dev/null
+++ b/bus_tracking/android/app/src/main/res/drawable/background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item android:drawable="@color/background"/>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launcher_icon"/>
+    </item>
+    
+</layer-list>
\ No newline at end of file
diff --git a/bus_tracking/android/app/src/main/res/drawable/gradient_background.xml b/bus_tracking/android/app/src/main/res/drawable/gradient_background.xml
new file mode 100644
index 0000000..a2d8d0e
--- /dev/null
+++ b/bus_tracking/android/app/src/main/res/drawable/gradient_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:dither="true"
+    android:layerType="software"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="@color/gradient_start"
+        android:endColor="@color/gradient_end"
+        android:angle="45" />
+</shape>
\ No newline at end of file
diff --git a/bus_tracking/android/app/src/main/res/values-night/colors.xml b/bus_tracking/android/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..ab92a69
--- /dev/null
+++ b/bus_tracking/android/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="background">#28578B</color>
+    <color name="gradient_start">#1565C0</color>
+    <color name="gradient_end">#37474F</color>
+</resources>
\ No newline at end of file
diff --git a/bus_tracking/android/app/src/main/res/values-night/styles.xml b/bus_tracking/android/app/src/main/res/values-night/styles.xml
index 06952be..bdd0bc3 100644
--- a/bus_tracking/android/app/src/main/res/values-night/styles.xml
+++ b/bus_tracking/android/app/src/main/res/values-night/styles.xml
@@ -4,7 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowBackground">@drawable/background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/bus_tracking/android/app/src/main/res/values/colors.xml b/bus_tracking/android/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..ab92a69
--- /dev/null
+++ b/bus_tracking/android/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="background">#28578B</color>
+    <color name="gradient_start">#1565C0</color>
+    <color name="gradient_end">#37474F</color>
+</resources>
\ No newline at end of file
diff --git a/bus_tracking/android/app/src/main/res/values/styles.xml b/bus_tracking/android/app/src/main/res/values/styles.xml
index cb1ef88..5796375 100644
--- a/bus_tracking/android/app/src/main/res/values/styles.xml
+++ b/bus_tracking/android/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowBackground">@drawable/background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/bus_tracking/assets/images/logo.jpg b/bus_tracking/assets/images/logo.jpg
new file mode 100644
index 0000000..6e0d806
Binary files /dev/null and b/bus_tracking/assets/images/logo.jpg differ
diff --git a/bus_tracking/lib/main.dart b/bus_tracking/lib/main.dart
index 82b2d62..bf0ce78 100644
--- a/bus_tracking/lib/main.dart
+++ b/bus_tracking/lib/main.dart
@@ -1,8 +1,11 @@
 import 'package:bus_tracking/models/locationKey.dart';
-import 'package:bus_tracking/pages/home.dart';
+import 'package:bus_tracking/pages/customSplashscreen.dart';
+import 'package:bus_tracking/pages/home_old.dart';
+// import 'package:bus_tracking/pages/home_old.dart';
 import 'package:bus_tracking/pages/location.dart';
 import 'package:bus_tracking/pages/resumepage.dart';
 import 'package:bus_tracking/pages/getLocationPermission/permission.dart';
+import 'package:bus_tracking/pages/splashScreen.dart';
 // import 'package:bus_tracking/pages/sendlocationpage.dart';
 import 'package:flutter/foundation.dart';
 import 'package:bus_tracking/poc.dart';
@@ -18,6 +21,8 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uni_links/uni_links.dart';
 
+import 'package:bus_tracking/pages/home.dart';
+
 
 final storage = FlutterSecureStorage();
 
@@ -30,7 +35,7 @@ void main() {
     debugShowCheckedModeBanner: false,
     initialRoute: "/",
     routes: {
-      "/": ((context) => Home()),
+      "/": ((context) => HomePage()),
       "/login" : ((context) => Login()),
       "/sendlocation": ((context) => sendLocationCheck()),
       '/resume-route': (context) => const ResumeRoutePage(),
@@ -68,27 +73,3 @@ void main() {
   ));
 }
 
-// class PocApp extends StatelessWidget {
-//   // This widget is the root of your application.
-//   @override
-//   Widget build(BuildContext context) {
-//     DeepLinkBloc _bloc = DeepLinkBloc();
-//     return MaterialApp(
-//         title: 'Flutter and Deep Linsk PoC',
-//         theme: ThemeData(
-//             primarySwatch: Colors.blue,
-//             textTheme: TextTheme(
-//               subtitle1: const TextStyle(
-//                 fontWeight: FontWeight.w300,
-//                 color: Colors.blue,
-//                 fontSize: 25.0,
-//               ),
-//             )),
-//         home: Scaffold(
-//             body: Provider<DeepLinkBloc>(
-//                 create: (context) => _bloc,
-//                 dispose: (context, bloc) => bloc.dispose(),
-//                 child: PocWidget()
-//                 )));
-//   }
-// }
diff --git a/bus_tracking/lib/models/logo.dart b/bus_tracking/lib/models/logo.dart
index 1afe91c..54269e1 100644
--- a/bus_tracking/lib/models/logo.dart
+++ b/bus_tracking/lib/models/logo.dart
@@ -12,4 +12,4 @@ final mainLogo = Container(
         image: AssetImage('assets/images/logo.png'),
     ),
   )
-);
\ No newline at end of file
+);
diff --git a/bus_tracking/lib/models/spinner.dart b/bus_tracking/lib/models/spinner.dart
index 7b27b57..468331d 100644
--- a/bus_tracking/lib/models/spinner.dart
+++ b/bus_tracking/lib/models/spinner.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
+import 'dart:ui' as ui;
 
 final CustomSpinner = SpinKitFadingFour(
   size: 60,
@@ -22,4 +23,48 @@ final CustomSpinnerWithTitle = SafeArea(
       backgroundColor: Colors.grey,
       body: CustomSpinner,
   ),
-);
\ No newline at end of file
+);
+
+// final CustomNewSpinner = SpinKitChasingDots(
+//   size: 60,
+//   itemBuilder: (BuildContext context, int index) {
+//     return DecoratedBox(
+//       decoration: BoxDecoration(
+//         color: index.isEven ? Colors.blueGrey[800] : Colors.blue[800],
+//       ),
+//     );
+//   },
+// );
+
+// final CustomNewSpinner = Container(
+//   width: 50.0,
+//   height: 50.0,
+//   decoration: BoxDecoration(
+//     gradient: LinearGradient(
+//       colors: [Color(0xFF1565C0), Color(0xFF424242)],
+//       begin: Alignment.topLeft,
+//       end: Alignment.bottomRight,
+//     ),
+//     shape: BoxShape.circle,
+//   ),
+//   child: SpinKitChasingDots(
+//     color: Colors.white,
+//     size: 30.0,
+//   ),
+// );
+
+final CustomNewSpinner = ShaderMask(
+  shaderCallback: (bounds) => LinearGradient(
+    begin: Alignment.topLeft,
+    end: Alignment.bottomRight,
+    colors: [Color(0xFF1565C0), Color(0xFF424242)],
+    tileMode: TileMode.repeated,
+  ).createShader(bounds),
+  child: SpinKitRing(
+    color: Colors.white,
+    size: 60.0,
+    lineWidth: 3.0,
+    duration: Duration(milliseconds: 1500),
+  ),
+);
+
diff --git a/bus_tracking/lib/pages/Login/login.dart b/bus_tracking/lib/pages/Login/login.dart
index 5408757..3d36eb5 100644
--- a/bus_tracking/lib/pages/Login/login.dart
+++ b/bus_tracking/lib/pages/Login/login.dart
@@ -97,7 +97,7 @@ class _LoginWidgetState extends State<LoginWidget> {
 
   Future<String?> attemptLogIn(String phoneNo, String password) async {
     final msg = jsonEncode({"phoneNo":phoneNo,"password":password,});
-      Map<String,String> headers = {'Content-Type':'application/json'};
+    Map<String,String> headers = {'Content-Type':'application/json'};
     var response = await post(
       Uri.parse(getUrl()+'login/'),
       headers: headers,
@@ -127,73 +127,199 @@ class _LoginWidgetState extends State<LoginWidget> {
 
   @override
   Widget build(BuildContext context) {
-    return _isLoginPressed ? CustomSpinnerWithTitle : SafeArea(
+    final topHeight = MediaQuery.of(context).size.height * 0.25;
+    final bottomHeight = MediaQuery.of(context).size.height * 0.75;
+    final mediaWidth = MediaQuery.of(context).size.width;
+
+    return SafeArea(
       child: GestureDetector(
         onTap: () {
           FocusManager.instance.primaryFocus?.unfocus();
         },
         child: Scaffold(
+          backgroundColor: Colors.grey[300],
           resizeToAvoidBottomInset: true,
-          appBar: AppBar(
-            backgroundColor: Colors.blueGrey[800],
-            title: Text('NWKRTC'),
-            centerTitle: true,
-          ),
           body: SingleChildScrollView(
             reverse: true,
-            child: Padding(
-                padding: const EdgeInsets.all(15),
-                child: Form(
-                  key: _formKey,
-                  child: Column(
-                    children: <Widget>[
-                      mainLogo,
-                      Container(
-                          alignment: Alignment.center,
-                          padding: const EdgeInsets.all(10),
-                          child: const Text(
-                            'LOGIN',
-                            style: TextStyle(
-                                color: Colors.black,
-                                fontWeight: FontWeight.w500,
-                                fontSize: 30),
-                          )),
-                      Container(
-                        padding: const EdgeInsets.all(15.0),
-                  
-                        child: TextFormField(
-                          keyboardType: TextInputType.number,
-                          cursorColor: Colors.black,
-                          controller: nameController,
-                          maxLength: 10,
-                          validator: (value){
-                          if (value!.isEmpty || value.length != 10 ||
-                                !RegExp(r'^(?:(?:\+|0{0,2})91(\s*[\-]\s*)?|[0]?)?[6789]\d{9}$')
-                                    .hasMatch(value)) {
-                              return 'Enter a valid Mobile number';
-                            }
-                          return null;
-          
-                          },
-                          decoration: const InputDecoration(
-                            focusedBorder: OutlineInputBorder(
-                              borderRadius: BorderRadius.all(Radius.circular(4)),
-                              borderSide: BorderSide(width: 1,color: Colors.black),
+            child: Column(
+            children: <Widget>[
+              Container(
+                height: topHeight,
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Stack(
+                      children: [
+                        ClipPath(
+                          clipper: _TrapeziumClipper1(),
+                          child: Container(
+                            width: MediaQuery.of(context).size.width * 0.5,
+                            decoration: BoxDecoration(
+                              gradient: LinearGradient(
+                                begin: Alignment.topLeft,
+                                end: Alignment.bottomRight,
+                                colors: [
+                                  Color(0xFF37474F),
+                                  Color(0xFF1565C0),
+                                ],
+                              ),
                             ),
-                            counter: SizedBox(
-                              width: 0,
-                              height: 0,
+                          ),
+                        ),
+                        Positioned(
+                          top: topHeight * 0.15,
+                          left: (mediaWidth*0.35 - topHeight*0.5)/2 > 0 ? (mediaWidth*0.35 - topHeight*0.5)/2 : 10,
+                          child: Container(
+                            width: topHeight * 0.5,
+                            height: topHeight * 0.5,
+                            decoration: BoxDecoration(
+                              color: Colors.white,
+                              shape: BoxShape.circle,
                             ),
-                            border: OutlineInputBorder(),
-                            labelStyle: TextStyle(color: Colors.black),
-                            labelText: 'Mobile No',
+                            child: Center(
+                              child: SizedBox(
+                                width: topHeight * 0.49,
+                                height: topHeight * 0.49,
+                                child: Image.asset('assets/images/logo.png'),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                    Stack(
+                      children: [
+                        ClipPath(
+                          clipper: _TrapeziumClipper2(),
+                          child: Container(
+                            width: MediaQuery.of(context).size.width * 0.5,
+                            decoration: BoxDecoration(
+                              gradient: LinearGradient(
+                                begin: Alignment.topLeft,
+                                end: Alignment.bottomRight,
+                                colors: [
+                                  Color(0xFF1565C0),
+                                  Color(0xFF37474F),
+                                ],
+                              ),
+                            ),
+    
                           ),
                         ),
-                      ),
-                      Container(
-                        padding: const EdgeInsets.all(15.0),
-                        child: TextFormField(
-                          cursorColor: Colors.black,
+                        Positioned(
+                          top: topHeight * 0.35,
+                          right: (mediaWidth*0.35 - topHeight*0.5)/2 > 0 ? (mediaWidth*0.35 - topHeight*0.5)/2 : 10,
+                          child: Container(
+                            width: topHeight * 0.5,
+                            height: topHeight * 0.5,
+                            child: Center(
+                              child: Text("NWKRTC\nBUS\nTRACKING",
+                              style: TextStyle(
+                                fontSize: 20,
+                                fontWeight:FontWeight.bold,
+                                color: Colors.white
+                              ),
+                              )
+                            ),
+                          ),
+                        ),
+                      ],
+                    )
+                  ],
+                ),
+              ),
+              
+    
+              if(_isLoginPressed) ...[
+                Padding(
+                  padding: EdgeInsets.only(
+                    top: (bottomHeight - 60)/2 > 0 ? (bottomHeight - 60)/2 : 40
+                  ),
+                  child: CustomNewSpinner,
+                )
+              ]
+    
+              else ...[
+    
+              SizedBox(
+                height: bottomHeight/10,
+              ),
+              Container(
+                width: mediaWidth * 0.75,
+                decoration: BoxDecoration(
+                  color: Colors.grey[100], // Fill color
+                  borderRadius: BorderRadius.circular(15), // Border radius
+                ),
+                child: Center(
+                  child: Form(
+                    key: _formKey,
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        SizedBox(
+                          height: topHeight/10,
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.all(8),
+                          child: const Text(
+                                'LOGIN',
+                                style: TextStyle(
+                                    color:  Colors.black,
+                                    fontWeight: FontWeight.w500,
+                                    fontSize: 25),
+                              )
+                          ),
+                          SizedBox(
+                            height: topHeight/8,
+                          ),
+                        
+                            
+                       
+                        Container(
+                          width: mediaWidth * 0.6,
+                          child: TextFormField(
+                            maxLength: 10,
+                            controller: nameController,
+                            cursorColor: Colors.black,
+                            keyboardType: TextInputType.phone,
+                            decoration: InputDecoration(
+                              labelText:  "Mobile Number",
+                            
+                              labelStyle: TextStyle(color: Colors.black, fontSize: 15),
+                              
+                              fillColor: Colors.grey[200],
+                              filled: true,
+                                    
+                              border: OutlineInputBorder(
+                                borderRadius: BorderRadius.circular(15.0), // rounded border
+                              ),
+                              enabledBorder: OutlineInputBorder(
+                                borderRadius: BorderRadius.circular(15.0), // rounded border
+                                borderSide: BorderSide(color: Color(0xFFEEEEEE)), // border color
+                              ),
+                              focusedBorder: OutlineInputBorder(
+                                borderRadius: BorderRadius.circular(15.0), // rounded border
+                                borderSide: BorderSide(color: Colors.black), // border color
+                              ),
+                              
+                            ),
+                            validator: (value){
+                              if (value!.isEmpty || value.length != 10 ||
+                                    !RegExp(r'^(?:(?:\+|0{0,2})91(\s*[\-]\s*)?|[0]?)?[6789]\d{9}$')
+                                        .hasMatch(value)) {
+                                  return 'Enter a valid Mobile number';
+                                }
+                              return null;
+                            
+                            },
+                          ),
+                        ),
+                        SizedBox(height: topHeight/8),
+
+                        Container(
+                          width: mediaWidth * 0.6,
+                          child: TextFormField(
+                          maxLength: 30,
                           obscureText: !_passwordVisible,
                           controller: passwordController,
                           validator: (value) {
@@ -202,16 +328,29 @@ class _LoginWidgetState extends State<LoginWidget> {
                             }
                             return null;
                           },
-                          decoration: InputDecoration(
-                            focusedBorder: OutlineInputBorder(
-                              borderRadius: BorderRadius.all(Radius.circular(4)),
-                              borderSide: BorderSide(width: 1,color: Colors.black),
-                            ),
+                            cursorColor: Colors.black,
+                            keyboardType: TextInputType.text,
+                            decoration: InputDecoration(
+                              labelText:  "Password",
                             
-                            border: OutlineInputBorder(),
-                            labelText: 'Password',
-                            labelStyle: TextStyle(color: Colors.black),
-                            suffixIcon: IconButton(
+                              labelStyle: TextStyle(color: Colors.black, fontSize: 15),
+                              
+                              fillColor: Colors.grey[200],
+                              filled: true,
+                                    
+                              border: OutlineInputBorder(
+                                borderRadius: BorderRadius.circular(15.0), // rounded border
+                              ),
+                              enabledBorder: OutlineInputBorder(
+                                borderRadius: BorderRadius.circular(15.0), // rounded border
+                                borderSide: BorderSide(color: Color(0xFFEEEEEE)), // border color
+                              ),
+                              focusedBorder: OutlineInputBorder(
+                                borderRadius: BorderRadius.circular(15.0), // rounded border
+                                borderSide: BorderSide(color: Colors.black), // border color
+                              ),
+
+                              suffixIcon: IconButton(
                               onPressed: (){
                                 setState(() {
                                   _passwordVisible = !_passwordVisible;
@@ -224,16 +363,54 @@ class _LoginWidgetState extends State<LoginWidget> {
                                 color: Colors.black,
                               )
                             )
+                              
+                            ),
+                            
                           ),
                         ),
-                      ),
-                      SizedBox(height: 20,),
-                      Container(
-                          height: 80,
-                          padding: const EdgeInsets.all(15.0),
+                                                 
+                        SizedBox(height: topHeight/8),
+                        Container(
+                          width: mediaWidth * 0.6,
+                          height: topHeight/5,
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.all(Radius.circular(15)),
+                            // color: !_isBusNumber ? null : Colors.grey.shade300,
+                            gradient:  LinearGradient(
+                            begin: Alignment.topLeft,
+                            end: Alignment.bottomRight,
+                            colors: [
+                               Color(0xFF28578B),
+                                Color(0xFF28578B),
+                              // Color(0xFF37474F),
+                              // Color(0xFF1565C0),
+                            ],
+                          ),
+                          ),
                           child: ElevatedButton(
-                            style: ElevatedButton.styleFrom(primary: Colors.blue[800]),
-                            child: const Text('Login'),
+                            
+                            
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Text(
+                                  'ENTER ',
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                                Icon(Icons.arrow_forward),
+                              ],
+                            ),
+                            style: ElevatedButton.styleFrom(
+                              
+                              primary: Colors.transparent,
+                              onPrimary: Colors.white,
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(15),
+                              ),
+                            ),
                             onPressed: () async {
                               if(!_formKey.currentState!.validate()){
                               return null;
@@ -247,7 +424,7 @@ class _LoginWidgetState extends State<LoginWidget> {
                               if(jwt != null) {
                                 await storage.write(key: "token", value: token);
                                 await storage.write(key: "jwt", value: jwt);
-                                Navigator.push(
+                                Navigator.pushReplacement(
                                   context,
                                   MaterialPageRoute(
                                     builder: (context) => sendLocationCheck(),
@@ -257,30 +434,76 @@ class _LoginWidgetState extends State<LoginWidget> {
                                 showDialog<String>(
                                   context: context,
                                   builder: (BuildContext context) => AlertDialog(
-                                    // backgroundColor: Colors.redAccent[300],
+                                      shape: RoundedRectangleBorder(
+                                      borderRadius: BorderRadius.circular(15.0),
+                                    ),
                                     
-                                    elevation: 1.0,
-                                    title:  Center(child: Text(errorMsg)),
-                                                        
-                                    actionsAlignment: MainAxisAlignment.center,
-                                    actions: <Widget>[
-                                      TextButton(
-                                        onPressed: () => Navigator.pop(context, 'OK'),
-                                        child: const Text('OK',style: TextStyle(color:Colors.black),),
-                                      ),
-                                    ],
-                                  ),
+                                      backgroundColor: Colors.grey[300],
+                                      
+                                      elevation: 2.0,
+                                      title:  Center(child: Text(errorMsg)),
+                                                          
+                                      actionsAlignment: MainAxisAlignment.center,
+                                      actions: <Widget>[
+                                        TextButton(
+                                          onPressed: () => Navigator.pop(context, 'OK'),
+                                          child: const Text('OK',style: TextStyle(color: Color(0xFF1565C0)),),
+                                        ),
+                                      ],
+                                    ),
                                   );
                                 }
                             },
-                          )
-                      ),
-                    ],
+                          ),
+                        ),
+                        SizedBox(height: topHeight/5)
+                      ],
+                    ),
                   ),
-                )),
+                ),
+              ),
+              
+              SizedBox(height: topHeight/10)
+              ]
+            ],
+          ),
           ),
         ),
       ),
     );
   }
+}
+
+class _TrapeziumClipper1 extends CustomClipper<Path> {
+  @override
+  Path getClip(Size size) {
+    final path = Path();
+    // path.moveTo(size.width * 0.1, 0);
+    path.moveTo(0, 0);
+    path.lineTo(size.width , 0);
+    path.lineTo(size.width * 0.7, size.height * 0.8);
+    path.lineTo(0, size.height * 0.8);
+    path.close();
+    return path;
+}
+
+@override
+bool shouldReclip(_TrapeziumClipper1 oldClipper) => false;
+}
+
+class _TrapeziumClipper2 extends CustomClipper<Path> {
+  @override
+  Path getClip(Size size) {
+    final path = Path();
+    // path.moveTo(size.width * 0.1, 0);
+    path.moveTo(size.width * 0.3, size.height * 0.2);
+    path.lineTo(size.width, size.height * 0.2);
+    path.lineTo(size.width, size.height);
+    path.lineTo(0, size.height);
+    path.close();
+    return path;
+}
+
+@override
+bool shouldReclip(_TrapeziumClipper2 oldClipper) => false;
 }
\ No newline at end of file
diff --git a/bus_tracking/lib/pages/customSplashscreen.dart b/bus_tracking/lib/pages/customSplashscreen.dart
new file mode 100644
index 0000000..2450783
--- /dev/null
+++ b/bus_tracking/lib/pages/customSplashscreen.dart
@@ -0,0 +1,54 @@
+import 'dart:async';
+import 'package:bus_tracking/pages/home.dart';
+import 'package:flutter/material.dart';
+
+class CustomSplashScreen extends StatefulWidget {
+  @override
+  _CustomSplashScreenState createState() => _CustomSplashScreenState();
+}
+
+class _CustomSplashScreenState extends State<CustomSplashScreen> {
+  bool _isLoading = true;
+
+  @override
+  void initState() {
+    super.initState();
+    Timer(Duration(seconds: 2), () {
+      setState(() {
+        _isLoading = false;
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedContainer(
+      duration: Duration(seconds: 2),
+      decoration: BoxDecoration(
+        gradient: LinearGradient(
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+          colors: [Color(0xFF1565C0), Color(0xFF424242)],
+        ),
+      ),
+      child: _isLoading
+          ? Container(
+            height: 100,
+            width: 100,
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(15),
+              color: Colors.white
+            ),
+            child: Center(
+                child: Image.asset(
+                  'assets/images/logo.jpg',
+                  // height: 100.0,
+                ),
+              ),
+          )
+          : HomePage(),
+      alignment: _isLoading ? Alignment.center : null,
+      curve: _isLoading ? Curves.linear : Curves.fastOutSlowIn,
+    );
+  }
+}
diff --git a/bus_tracking/lib/pages/getLocationPermission/permission.dart b/bus_tracking/lib/pages/getLocationPermission/permission.dart
index 7189f2c..d830325 100644
--- a/bus_tracking/lib/pages/getLocationPermission/permission.dart
+++ b/bus_tracking/lib/pages/getLocationPermission/permission.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:android_intent_plus/android_intent.dart';
 import 'package:fl_location/fl_location.dart';
+import 'package:app_settings/app_settings.dart';
 
 
 
@@ -15,87 +16,277 @@ class _getPermissionState extends State<getPermission> {
 
 
   Future<bool> _checkAndRequestPermission({bool? background}) async {
-    if (!await FlLocation.isLocationServicesEnabled) {
-        final AndroidIntent intent  = new AndroidIntent(
-        action: 'android.settings.LOCATION_SOURCE_SETTINGS',
-      );
-
-      await intent.launch();
-    }
 
 
     var locationPermission = await FlLocation.checkLocationPermission();
-    // if (locationPermission == LocationPermission.deniedForever) {
-    //   // Cannot request runtime permission because location permission is denied forever.
-    //   return false;
-    // } else 
-    if (locationPermission == LocationPermission.denied || locationPermission == LocationPermission.deniedForever) {
-      // Ask the user for location permission.
-      locationPermission = await FlLocation.requestLocationPermission();
-      if (locationPermission == LocationPermission.denied ||
-          locationPermission == LocationPermission.deniedForever) return false;
-    }
-
-    // Location permission must always be allowed (LocationPermission.always)
-    // to collect location data in the background.
-    if (background == true &&
-        locationPermission == LocationPermission.whileInUse) return false;
+
+    if(locationPermission == LocationPermission.always) return true;
+
+    locationPermission = await FlLocation.requestLocationPermission();
 
     // Location services has been enabled and permission have been granted.
-    return true;
+    if(locationPermission == LocationPermission.always) return true;
+    await AppSettings.openAppSettings();
+    return false;
   }
 
   @override
   Widget build(BuildContext context) {
-      print("came to permission");
-
-    return Scaffold(
-      body: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-        
-         Padding(
-           padding: const EdgeInsets.all(10.0),
-           child: Column(
-             children: [
-               Center(
-                 child: Text(
-                  "Bus tracking collects location data to enable sending your location to passengers of your bus even when the app is closed or not in use.",
-                   style: TextStyle(fontSize: 18), 
+      final topHeight = MediaQuery.of(context).size.height * 0.25;
+      final bottomHeight = MediaQuery.of(context).size.height * 0.75;
+      final mediaWidth = MediaQuery.of(context).size.width;
+
+      return SafeArea(
+      child: GestureDetector(
+        onTap: () {
+          FocusManager.instance.primaryFocus?.unfocus();
+        },
+        child: Scaffold(
+          backgroundColor: Colors.grey[300],
+          resizeToAvoidBottomInset: true,
+          body: SingleChildScrollView(
+            reverse: true,
+            child: Column(
+            children: <Widget>[
+              SizedBox(
+                height: topHeight,
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Stack(
+                      children: [
+                        ClipPath(
+                          clipper: _TrapeziumClipper1(),
+                          child: Container(
+                            width: MediaQuery.of(context).size.width * 0.5,
+                            decoration: const BoxDecoration(
+                              gradient: LinearGradient(
+                                begin: Alignment.topLeft,
+                                end: Alignment.bottomRight,
+                                colors: [
+                                  Color(0xFF37474F),
+                                  Color(0xFF1565C0),
+                                ],
+                              ),
+                            ),
+                            
+                          ),
+                        ),
+                        Positioned(
+                          top: topHeight * 0.15,
+                          left: (mediaWidth*0.35 - topHeight*0.5)/2 > 0 ? (mediaWidth*0.35 - topHeight*0.5)/2 : 10,
+                          child: Container(
+                            width: topHeight * 0.5,
+                            height: topHeight * 0.5,
+                            decoration: const BoxDecoration(
+                              color: Colors.white,
+                              shape: BoxShape.circle,
+                            ),
+                            child: Center(
+                              child: SizedBox(
+                                width: topHeight * 0.49,
+                                height: topHeight * 0.49,
+                                child: Image.asset('assets/images/logo.png'),
+                              ),
+                            ),
+                          ),
+                          
+                        ),
+                      ],
+                    ),
+                    Stack(
+                      children: [
+                        ClipPath(
+                          clipper: _TrapeziumClipper2(),
+                          child: Container(
+                            width: MediaQuery.of(context).size.width * 0.5,
+                            decoration: const BoxDecoration(
+                              gradient: LinearGradient(
+                                begin: Alignment.topLeft,
+                                end: Alignment.bottomRight,
+                                colors: [
+                                  Color(0xFF1565C0),
+                                  Color(0xFF37474F),
+                                ],
+                              ),
+                            ),
+    
+                          ),
+                        ),
+                        Positioned(
+                          top: topHeight * 0.35,
+                          right: (mediaWidth*0.35 - topHeight*0.5)/2 > 0 ? (mediaWidth*0.35 - topHeight*0.5)/2 : 10,
+                          child: SizedBox(
+                            width: topHeight * 0.5,
+                            height: topHeight * 0.5,
+                            child: const Center(
+                              child: Text("NWKRTC\nBUS\nTRACKING",
+                              style: TextStyle(
+                                fontSize: 20,
+                                fontWeight:FontWeight.bold,
+                                color: Colors.white
+                              ),
+                              )
+                            ),
+                          ),
+                        ),
+                      ],
+                    )
+                  ],
                 ),
-               ),
-              SizedBox(height: 20),
+              ),
+              
 
-              Center(
-                 child: Text(
-                  "Please press agree and select 'allow all the time' to give permission",
-                   style: TextStyle(fontSize: 18), 
+              SizedBox(
+                height: bottomHeight/10,
+              ),
+              Container(
+                width: mediaWidth * 0.75,
+                decoration: BoxDecoration(
+                  color: Colors.grey[100], // Fill color
+                  borderRadius: BorderRadius.circular(15), // Border radius
                 ),
-               ),
-
-             ],
-           ),
-         ),
-         SizedBox(height: 40,),
-         
-        ElevatedButton(
-          style: ElevatedButton.styleFrom(primary: Colors.blue[800]),
-          onPressed: (){
-          print("asking something");
-          _checkAndRequestPermission(background: true).then((value){
-            print("value is"+value.toString());
-            if(value== true){
-              print("popping");
-              Navigator.of(context).pushReplacementNamed("/login");
-
-            }
-          });
-        }, 
-        child: Text("Agree")
-        ) ,
-        
-      ]),
+                child: Center(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      SizedBox(
+                        height: topHeight/10,
+                      ),
+                      const Padding(
+                        padding: EdgeInsets.all(8),
+                        child: Text(
+                              'PERMISSION',
+                              style: TextStyle(
+                                  color:  Colors.black,
+                                  fontWeight: FontWeight.w500,
+                                  fontSize: 25),
+                            )
+                        ),
+                        SizedBox(
+                          height: topHeight/8,
+                        ),
+
+                        const Center(
+                          child: Padding(
+                            padding: EdgeInsets.all(10.0),
+                            child: Text(
+                              "Bus tracking collects location data to enable sending your location to passengers of your bus even when the app is closed or not in use.",
+                              style: TextStyle(fontSize: 16), 
+                            ),
+                          ),
+                        ),
+                        const SizedBox(height: 20),
+
+                        const Center(
+                          child: Padding(
+                            padding: EdgeInsets.all(10.0),
+                            child: Text(
+                              "Please press agree and select 'allow all the time' to give permission",
+                              style: TextStyle(fontSize: 16), 
+                            ),
+                          ),
+                        ),
+
+                        SizedBox(height: topHeight/8),
+                        Container(
+                          width: mediaWidth * 0.6,
+                          height: topHeight/5,
+                          decoration: const BoxDecoration(
+                            borderRadius: BorderRadius.all(Radius.circular(15)),
+                            // color: !_isBusNumber ? null : Colors.grey.shade300,
+                            gradient:  LinearGradient(
+                            begin: Alignment.topLeft,
+                            end: Alignment.bottomRight,
+                            colors: [
+                               Color(0xFF28578B),
+                                Color(0xFF28578B),
+                              // Color(0xFF37474F),
+                              // Color(0xFF1565C0),
+                            ],
+                          ),
+                          ),
+                          child: ElevatedButton(
+                            
+                            
+                            style: ElevatedButton.styleFrom(
+                              
+                              primary: Colors.transparent,
+                              onPrimary: Colors.white,
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(15),
+                              ),
+                            ),
+                            onPressed: (){
+                              _checkAndRequestPermission(background: true).then((value){
+                                if(value== true){
+                                  Navigator.of(context).pushReplacementNamed("/login");
+                                  }
+                                });
+                              },
+                            
+                            
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: const [
+                                Text(
+                                  'AGREE ',
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                                Icon(Icons.check),
+                              ],
+                            ),
+                          ),
+                        ),
+                        SizedBox(height: topHeight/5)
+                    ],
+                  ),
+                ),
+              ),
+              
+              SizedBox(height: topHeight/10)
+            ],
+          ),
+          ),
+        ),
+      ),
     );
   }
+}
+
+class _TrapeziumClipper1 extends CustomClipper<Path> {
+  @override
+  Path getClip(Size size) {
+    final path = Path();
+    // path.moveTo(size.width * 0.1, 0);
+    path.moveTo(0, 0);
+    path.lineTo(size.width , 0);
+    path.lineTo(size.width * 0.7, size.height * 0.8);
+    path.lineTo(0, size.height * 0.8);
+    path.close();
+    return path;
+}
+
+@override
+bool shouldReclip(_TrapeziumClipper1 oldClipper) => false;
+}
+
+class _TrapeziumClipper2 extends CustomClipper<Path> {
+  @override
+  Path getClip(Size size) {
+    final path = Path();
+    // path.moveTo(size.width * 0.1, 0);
+    path.moveTo(size.width * 0.3, size.height * 0.2);
+    path.lineTo(size.width, size.height * 0.2);
+    path.lineTo(size.width, size.height);
+    path.lineTo(0, size.height);
+    path.close();
+    return path;
+}
+
+@override
+bool shouldReclip(_TrapeziumClipper2 oldClipper) => false;
 }
\ No newline at end of file
diff --git a/bus_tracking/lib/pages/home.dart b/bus_tracking/lib/pages/home.dart
index 3f9e132..d6cd01f 100644
--- a/bus_tracking/lib/pages/home.dart
+++ b/bus_tracking/lib/pages/home.dart
@@ -15,19 +15,16 @@ import 'package:flutter/services.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:uni_links/uni_links.dart';
 import 'package:bus_tracking/utils/busNoRegex.dart';
+import 'package:url_launcher/url_launcher.dart';
 
-class Home extends StatefulWidget {
-  const Home({Key? key}) : super(key: key);
-
+class HomePage extends StatefulWidget {
   @override
-  State<Home> createState() => _HomeState();
+  State<HomePage> createState() => _HomePageState();
 }
-bool _initialURILinkHandled = false;
-
-
 
+bool _initialURILinkHandled = false;
 
-class _HomeState extends State<Home> {
+class _HomePageState extends State<HomePage> {
 
   void _autoLogOut(String value){
     var curTime = DateTime.now().millisecondsSinceEpoch;
@@ -47,15 +44,15 @@ class _HomeState extends State<Home> {
 
   }
 
-
-
   @override
   void initState() {
     // var curTime = DateTime.now().millisecondsSinceEpoch;
     // storage.write(key: 'timeStamp',value: curTime.toString());
     super.initState();
-  _initURIHandler();
-  _incomingLinkHandler();
+    _focusNode = FocusNode();
+    _focusNode2 = FocusNode();
+    _initURIHandler();
+    _incomingLinkHandler();
   // _storeTime();
     // _locationController = StreamController();
   }
@@ -135,9 +132,15 @@ class _HomeState extends State<Home> {
   }
   }
   String errorMsg = "Invalid Data";
-  Future<String?> isValidData(String phoneNo, String busNo) async {
-    final msg = jsonEncode({"number":phoneNo,"bus_no":busNo});
-      Map<String,String> headers = {'Content-Type':'application/json'};
+  Future<String?> isValidData(String busOrPhoneNumber, bool _isBusNum) async {
+    final msg;
+    if(_isBusNum){
+      msg = jsonEncode({"bus_no":busOrPhoneNumber});
+    }
+    else {
+      msg = jsonEncode({"number":busOrPhoneNumber});
+    }
+    Map<String,String> headers = {'Content-Type':'application/json'};
     var response = await http.post(
       Uri.parse(getUrl() +  'get-key/'),
       headers: headers,
@@ -166,12 +169,6 @@ class _HomeState extends State<Home> {
 
     return null;
   }
-  // @override
-  // void initState() {
-  // super.initState();
-  // // _initURIHandler();
-  // // _incomingLinkHandler();
-  // }
 
   @override
   void dispose()async{
@@ -180,201 +177,536 @@ class _HomeState extends State<Home> {
   super.dispose();
   }
 
-  TextEditingController phoneNoController = TextEditingController();
-  TextEditingController busNameController = TextEditingController();
 
+  bool _isBusNumber = true;
+
+  TextEditingController _textEditingController = TextEditingController();
+  TextEditingController _textEditingController2 = TextEditingController();
+
+  late FocusNode _focusNode;
+  late FocusNode _focusNode2;
+
+  final _formKey = GlobalKey<FormState>();
   bool _isTrackPressed = false;
-  var _formKey = GlobalKey<FormState>();
+
 
   @override
   Widget build(BuildContext context) {
-    return _isTrackPressed ? CustomSpinnerWithTitle : SafeArea(
-      child: GestureDetector(
-        onTap: () {
+    final topHeight = MediaQuery.of(context).size.height * 0.25;
+    final bottomHeight = MediaQuery.of(context).size.height * 0.75;
+    final mediaWidth = MediaQuery.of(context).size.width;
+    return GestureDetector(
+      onTap: () {
           FocusManager.instance.primaryFocus?.unfocus();
-        },
-        child: Scaffold(
-          resizeToAvoidBottomInset : true,
-          backgroundColor: Colors.grey[200],
-          appBar: AppBar(
-            backgroundColor: Colors.blueGrey[800],
-            // backgroundColor: Color.fromARGB(255, 193, 72, 31),
-            title: Text('NWKRTC'),
-            centerTitle: true,
-            actions: [
-              FlatButton.icon(
-                onPressed: (){
-                 print('login button');
-                storage.read(key: 'timeStamp').then((value){
-                  if(value != null){
-                    print('value not null');
-                    _autoLogOut(value);
-                  }
-                });
-                // ignore: use_build_context_synchronously
-                Navigator.pushNamed(context, '/login');
-              }, 
-              icon: Icon(
-                Icons.login,
-                color: Colors.white,
-              ), label: Text('Login',style: TextStyle(color: Colors.white),),)
-            ],
-          ),
-          body: SingleChildScrollView(
-            reverse: true,
-            child: Padding(
-              padding: const EdgeInsets.all(15.0),
-              child: Form(
-                key: _formKey,
-                child: Column(
-                  children: <Widget>[
-                    //Logo
-                    mainLogo,
-                    Container(
-                        alignment: Alignment.center,
-                        padding: const EdgeInsets.all(15),
-                        child: const Text(
-                          'Track Your Bus',
-                          style: TextStyle(
-                              color:  Colors.black,
-                              fontWeight: FontWeight.w500,
-                              fontSize: 30),
-                        )),
-                    Container(
-                      padding: const EdgeInsets.all(15),
-                      child: TextFormField(
-                       keyboardType: TextInputType.number,
-                        controller: phoneNoController,
-                        maxLength: 10,
-                        
-                        validator: (value){
-                          if (value!.isEmpty || value.length != 10 ||
-                                !RegExp(r'^(?:(?:\+|0{0,2})91(\s*[\-]\s*)?|[0]?)?[6789]\d{9}$')
-                                    .hasMatch(value)) {
-                              return 'Enter a valid Mobile number';
-                            }
-                          return null;
-          
-                       },
-                      
-                        
-                        cursorColor: Colors.black,
-                        decoration: const InputDecoration(
-                          focusedBorder: OutlineInputBorder(
-                              borderRadius: BorderRadius.all(Radius.circular(4)),
-                              borderSide: BorderSide(width: 1,color: Colors.black),
+      },
+      child: SafeArea(child:  Scaffold(
+      backgroundColor: Colors.grey[300],
+      resizeToAvoidBottomInset: true,
+        body: SingleChildScrollView(
+          reverse: true,
+          child: Column(
+            children: <Widget>[
+              Container(
+                height: topHeight,
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Stack(
+                      children: [
+                        ClipPath(
+                          clipper: _TrapeziumClipper1(),
+                          child: Container(
+                            width: MediaQuery.of(context).size.width * 0.5,
+                            decoration: BoxDecoration(
+                              gradient: LinearGradient(
+                                begin: Alignment.topLeft,
+                                end: Alignment.bottomRight,
+                                colors: [
+                                  Color(0xFF37474F),
+                                  Color(0xFF1565C0),
+                                ],
+                              ),
                             ),
-                            counter: SizedBox(
-                              width: 0,
-                              height: 0,
+                            // child: Center(
+                            //   child: Text(
+                            //     'Bus\nTracking',
+                            //     style: TextStyle(
+                            //       color: Colors.white,
+                            //       fontSize: 25,
+                            //       fontWeight: FontWeight.bold,
+                            //     ),
+                            //   ),
+                            // ),
+                          ),
+                        ),
+                        Positioned(
+                          top: topHeight * 0.15,
+                          left: (mediaWidth*0.35 - topHeight*0.5)/2 > 0 ? (mediaWidth*0.35 - topHeight*0.5)/2 : 10,
+                          child: Container(
+                            width: topHeight * 0.5,
+                            height: topHeight * 0.5,
+                            decoration: BoxDecoration(
+                              color: Colors.white,
+                              shape: BoxShape.circle,
                             ),
-                            
-                            border: OutlineInputBorder(),
-                            labelStyle: TextStyle(color: Colors.black),
-                          labelText: 'Conductor Number',
-                          
+                            child: Center(
+                              child: SizedBox(
+                                width: topHeight * 0.49,
+                                height: topHeight * 0.49,
+                                child: Image.asset('assets/images/logo.png'),
+                              ),
+                            ),
+                          ),
                         ),
-                      ),
+                      ],
                     ),
-                    Container(
-                      padding: const EdgeInsets.all(15),
-                      child: TextFormField(
-                        inputFormatters: [
-                          UpperCaseTextFormatter(),
-                          LengthLimitingTextInputFormatter(9),
-                        ],
-                        controller: busNameController,
-                        cursorColor: Colors.black,
-                        validator: (value){
-                          // if (value!.isEmpty ||
-                          //       !RegExp("^[A-Z]{1}[0-9]{4}\$")
-                          //           .hasMatch(value)) {
-                          //     return 'Enter a valid Bus No';
-                          //   }
-                            return null;
-                        },
-                        decoration: const InputDecoration(
-                          focusedBorder: OutlineInputBorder(
-                              borderRadius: BorderRadius.all(Radius.circular(4)),
-                              borderSide: BorderSide(width: 1,color: Colors.black),
+                    Stack(
+                      children: [
+                        ClipPath(
+                          clipper: _TrapeziumClipper2(),
+                          child: Container(
+                            width: MediaQuery.of(context).size.width * 0.5,
+                            decoration: BoxDecoration(
+                              gradient: LinearGradient(
+                                begin: Alignment.topLeft,
+                                end: Alignment.bottomRight,
+                                colors: [
+                                  Color(0xFF1565C0),
+                                  Color(0xFF37474F),
+                                ],
+                              ),
                             ),
-                            
-                            border: OutlineInputBorder(),
-                            labelStyle: TextStyle(color: Colors.black),
-                          labelText: 'Bus No',
+    
+                          ),
                         ),
-                      ),
-                    ),
-                    SizedBox(height: 20,),
-                    Container(
-                        height: 50,
-                        padding: const EdgeInsets.fromLTRB(10, 0, 10, 0),
-                        child: ElevatedButton(
-                          style: ElevatedButton.styleFrom(primary: Colors.blue[800] ),
-                          child: const Text('Track'),
-                          
-                          onPressed: () async {
-                            var phoneNo = phoneNoController.text.toString();
-                            var busNo = busNameController.text.toString();
-                           
-                            if(!_formKey.currentState!.validate()){
-                              return null;
-                            }
-                            //Spinner
-                            setState(() {
-                              _isTrackPressed = true;
-                            });
-                            // Navigator.pushNamed(context, '/location',arguments: locationData(phoneNo,busNo));
-                            var apiKey = await isValidData(phoneNo, busNo);
-                            if(apiKey != null && apiKey != "null") {
-                              Navigator.pushNamed(context, '/location',arguments: locationKey(apiKey, busNo));
-                            } else {
-                              // AlertDialog(
-                              //   content: Text('Error occured'),
-                              // );
-                              showDialog<String>(
-                              context: context,
-                              builder: (BuildContext context) => AlertDialog(
-                                // backgroundColor: Colors.redAccent[300],
+                        Positioned(
+                          top: topHeight * 0.35,
+                          right: (mediaWidth*0.35 - topHeight*0.5)/2 > 0 ? (mediaWidth*0.35 - topHeight*0.5)/2 : 10,
+                          child: Container(
+                            width: topHeight * 0.5,
+                            height: topHeight * 0.5,
+                            child: Center(
+                              child: Text("NWKRTC\nBUS\nTRACKING",
+                              style: TextStyle(
+                                fontSize: 20,
+                                fontWeight:FontWeight.bold,
+                                color: Colors.white
+                              ),
+                              )
+                            ),
+                          ),
+                        ),
+                      ],
+                    )
+                  ],
+                ),
+              ),
+              
+    
+              if(_isTrackPressed) ...[
+                Padding(
+                  padding: EdgeInsets.only(
+                    top: (bottomHeight - 60)/2 > 0 ? (bottomHeight - 60)/2 : 40
+                  ),
+                  child: CustomNewSpinner,
+                )
+              ]
+    
+              else ...[
+    
+              SizedBox(
+                height: bottomHeight/10,
+              ),
+              Container(
+                width: mediaWidth * 0.75,
+                decoration: BoxDecoration(
+                  color: Colors.grey[100], // Fill color
+                  borderRadius: BorderRadius.circular(15), // Border radius
+                ),
+                child: Center(
+                  child: Form(
+                    key: _formKey,
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        SizedBox(
+                          height: topHeight/10,
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.all(8),
+                          child: const Text(
+                                'TRACK YOUR BUS',
+                                style: TextStyle(
+                                    color:  Colors.black,
+                                    fontWeight: FontWeight.w500,
+                                    fontSize: 25),
+                              )
+                          ),
+                          SizedBox(
+                            height: topHeight/8,
+                          ),
+                        if(_isBusNumber) ...[
+                            Visibility(
+                            
+                              visible: _isBusNumber,
+                              child: Container(
+                                width: mediaWidth * 0.6,
+                                child: TextFormField(
+                                  
+                                  focusNode: _focusNode,
+                                  controller: _textEditingController,
+                                  cursorColor: Colors.black,
+                                  keyboardType: _isBusNumber ? TextInputType.text : null,
+                                  decoration: InputDecoration(
+                                    labelText: "Bus Number",
+                                            
+                                    labelStyle: TextStyle(color: Colors.black, fontSize: 15),
+                                    
+                                    fillColor: Colors.grey[200],
+                                    filled: true,
+                                            
+                                    border: OutlineInputBorder(
+                                      borderRadius: BorderRadius.circular(15.0), // rounded border
+                                    ),
+                                    enabledBorder: OutlineInputBorder(
+                                      borderRadius: BorderRadius.circular(15.0), // rounded border
+                                      borderSide: BorderSide(color: Color(0xFFEEEEEE)), // border color
+                                    ),
+                                    focusedBorder: OutlineInputBorder(
+                                      borderRadius: BorderRadius.circular(15.0), // rounded border
+                                      borderSide: BorderSide(color: Colors.black), // border color
+                                    ),
+                                    
+                                  ),
+                  
+                                  validator: (value){
+                                    return null;
+                                  },
+                                ),
+                              ),
+                            ),
+                        ]
+                        else ...[
+                          Visibility(
+                            visible: !_isBusNumber,
+                            child: Container(
+                              width: mediaWidth * 0.6,
+                              child: TextFormField(
+                                maxLength: 10,
+                                focusNode: _focusNode2,
+                                controller: _textEditingController2,
+                                cursorColor: Colors.black,
+                                keyboardType: _isBusNumber ? null : TextInputType.phone,
+                                decoration: InputDecoration(
+                                  labelText:  "Mobile Number",
                                 
-                                elevation: 1.0,
-                                title:  Center(child: Text(errorMsg)),
-                                // content:  Row(
-                                //   mainAxisAlignment: MainAxisAlignment.center,
-                                //   crossAxisAlignment: CrossAxisAlignment.center,
-                                //   children : <Widget>[
-                                //     Expanded(
-                                //       child: Text(
-                                //         'Invalid Data',
-                                //         textAlign: TextAlign.center,
+                                  labelStyle: TextStyle(color: Colors.black, fontSize: 15),
+                                  
+                                  fillColor: Colors.grey[200],
+                                  filled: true,
                                         
-                                //       ),
-                                //     )
-                                //   ],
-                                // ),                      
-                                actionsAlignment: MainAxisAlignment.center,
-                                actions: <Widget>[
-                                  TextButton(
-                                    onPressed: () => Navigator.pop(context, 'OK'),
-                                    child: const Text('OK',style: TextStyle(color: Color.fromARGB(255, 39, 91, 42)),),
+                                  border: OutlineInputBorder(
+                                    borderRadius: BorderRadius.circular(15.0), // rounded border
                                   ),
-                                ],
+                                  enabledBorder: OutlineInputBorder(
+                                    borderRadius: BorderRadius.circular(15.0), // rounded border
+                                    borderSide: BorderSide(color: Color(0xFFEEEEEE)), // border color
+                                  ),
+                                  focusedBorder: OutlineInputBorder(
+                                    borderRadius: BorderRadius.circular(15.0), // rounded border
+                                    borderSide: BorderSide(color: Colors.black), // border color
+                                  ),
+                                  
+                                ),
+                                validator: (value){
+                                  if(_isBusNumber) return null;
+                                  if (value!.isEmpty || value.length != 10 ||
+                                        !RegExp(r'^(?:(?:\+|0{0,2})91(\s*[\-]\s*)?|[0]?)?[6789]\d{9}$')
+                                            .hasMatch(value)) {
+                                      return 'Enter a valid Mobile number';
+                                    }
+                                  return null;
+                                
+                                },
                               ),
-                              );
-                          
-                            }
-                          },
-                        )
-                    )
-                  ]
+                            ),
+                          ),
+                        ],  
+                        SizedBox(height: topHeight/8),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            GestureDetector(
+                              onTap: () {
+                                setState(() {
+                                  _isBusNumber = true;
+                                  _textEditingController2.clear();
+                                  _focusNode2.unfocus();
+                                  _focusNode.requestFocus();
+                                });
+                              },
+                              child: Container(
+                                width: mediaWidth * 0.3,
+                                padding: EdgeInsets.symmetric(vertical: 10, horizontal: 20),
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.only(
+                                    topLeft: Radius.circular(15),
+                                    bottomLeft: Radius.circular(15),
+                                  ),
+                                  color: _isBusNumber ? null: Colors.grey.shade300,
+                                  gradient: _isBusNumber ? LinearGradient(
+                                    begin: Alignment.topLeft,
+                                    end: Alignment.bottomRight,
+                                    colors: [
+                                      Color(0xFF28578B),
+                                         Color(0xFF28578B),
+                                      // Color(0xFF37474F),
+                                      // Color(0xFF1565C0),
+                                    ],
+                                  ) : null,
+                                ),
+                                child: const Center(
+                                  child: Text(
+                                    'BUS',
+                                    style: TextStyle(
+                                      color: Colors.white,
+                                      fontWeight: FontWeight.bold,
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                            GestureDetector(
+                              onTap: () {
+                                setState(() {
+                                  _isBusNumber = false;
+                                  _textEditingController.clear();
+                                  _focusNode.unfocus();
+                                  _focusNode2.requestFocus();
+                                });
+                              },
+                              child: Container(
+                                width: mediaWidth * 0.3,
+                  
+                                padding: EdgeInsets.symmetric(vertical: 10, horizontal: 20),
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.only(
+                                    topRight: Radius.circular(15),
+                                    bottomRight: Radius.circular(15),
+                                  ),
+                                  color: !_isBusNumber ? null : Colors.grey.shade300,
+                                  gradient: !_isBusNumber ? LinearGradient(
+                                  begin: Alignment.topLeft,
+                                  end: Alignment.bottomRight,
+                                  colors: [
+                                     Color(0xFF28578B),
+                                      Color(0xFF28578B),
+                                    // Color(0xFF37474F),
+                                    // Color(0xFF1565C0),
+                                  ],
+                                ) : null,
+                                ),
+                                child: Center(
+                                  child: Text(
+                                    'MOBILE',
+                                    style: TextStyle(
+                                      color: Colors.white,
+                                      fontWeight: FontWeight.bold,
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                        SizedBox(height: topHeight/8),
+                        Container(
+                          width: mediaWidth * 0.6,
+                          height: topHeight/5,
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.all(Radius.circular(15)),
+                            // color: !_isBusNumber ? null : Colors.grey.shade300,
+                            gradient:  LinearGradient(
+                            begin: Alignment.topLeft,
+                            end: Alignment.bottomRight,
+                            colors: [
+                               Color(0xFF28578B),
+                                Color(0xFF28578B),
+                              // Color(0xFF37474F),
+                              // Color(0xFF1565C0),
+                            ],
+                          ),
+                          ),
+                          child: ElevatedButton(
+                            onPressed: () async {
+                              var busOrPhoneNumber;
+                                if(_isBusNumber){
+                                  busOrPhoneNumber = _textEditingController.text.toString();
+                                }
+                                else{
+                                  busOrPhoneNumber = _textEditingController2.text.toString();
+                                }
+                               
+                                if(!_formKey.currentState!.validate()){
+                                  return null;
+                                }
+                  
+                                print("hi");
+                                //Spinner
+                                setState(() {
+                                  _isTrackPressed = true;
+                                });
+                                // Navigator.pushNamed(context, '/location',arguments: locationData(phoneNo,busNo));
+                                var apiKey = await isValidData(busOrPhoneNumber, _isBusNumber);
+                                if(apiKey != null && apiKey != "null") {
+                                  Navigator.pushNamed(context, '/location',arguments: locationKey(apiKey, busOrPhoneNumber));
+                                } else {
+                                  
+                                  showDialog<String>(
+                                  context: context,
+                                  builder: (BuildContext context) => AlertDialog(
+    
+                                    shape: RoundedRectangleBorder(
+                                    borderRadius: BorderRadius.circular(15.0),
+                                  ),
+                                  
+                                    backgroundColor: Colors.grey[300],
+                                    
+                                    elevation: 2.0,
+                                    title:  Center(child: Text(errorMsg)),
+                                                         
+                                    actionsAlignment: MainAxisAlignment.center,
+                                    actions: <Widget>[
+                                      TextButton(
+                                        onPressed: () => Navigator.pop(context, 'OK'),
+                                        child: const Text('OK',style: TextStyle(color: Color(0xFF1565C0)),),
+                                      ),
+                                    ],
+                                  ),
+                                  );
+                              
+                                }
+                              },
+                            
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Text(
+                                  'TRACK ',
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                                Icon(Icons.arrow_forward),
+                              ],
+                            ),
+                            style: ElevatedButton.styleFrom(
+                              
+                              primary: Colors.transparent,
+                              onPrimary: Colors.white,
+                              
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(15),
+                              ),
+                            ),
+                          ),
+                        ),
+                        SizedBox(height: topHeight/5)
+                      ],
+                    ),
+                  ),
                 ),
               ),
-            ),
-          )
+              SizedBox(height: topHeight/8),
+              Container(
+                width: mediaWidth * 0.5,
+                child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Container(
+                            decoration: BoxDecoration(
+                              color: Colors.grey[400],
+                              shape: BoxShape.circle,
+                            ),
+                            padding: EdgeInsets.all(8),
+                            child: IconButton(
+                              icon: Icon(Icons.login),
+                              onPressed: (){
+                                storage.read(key: 'timeStamp').then((value){
+                                  if(value != null){
+                                    _autoLogOut(value);
+                                  }
+                                });
+                                // ignore: use_build_context_synchronously
+                                Navigator.pushNamed(context, '/login');
+                              }, 
+                            ),
+                          ),
+                          InkWell(
+                            child: Container(
+                              decoration: BoxDecoration(
+                                color: Colors.grey[400],
+                                shape: BoxShape.circle,
+                              ),
+                              padding: EdgeInsets.all(8),
+                              child: IconButton(
+                                icon: Icon(Icons.link),
+                                onPressed: () {
+                                  launch('https://tracknwkrtc.in/');
+                                },
+                              ),
+                            ),
+                          ),
+                        ],
+                      )
+              ),
+              SizedBox(height: topHeight/10)
+              ]
+            ],
+          ),
         ),
+      )
       ),
     );
   }
 }
 
-        
\ No newline at end of file
+class _TrapeziumClipper1 extends CustomClipper<Path> {
+  @override
+  Path getClip(Size size) {
+    final path = Path();
+    // path.moveTo(size.width * 0.1, 0);
+    path.moveTo(0, 0);
+    path.lineTo(size.width , 0);
+    path.lineTo(size.width * 0.7, size.height * 0.8);
+    path.lineTo(0, size.height * 0.8);
+    path.close();
+    return path;
+}
+
+@override
+bool shouldReclip(_TrapeziumClipper1 oldClipper) => false;
+}
+
+class _TrapeziumClipper2 extends CustomClipper<Path> {
+  @override
+  Path getClip(Size size) {
+    final path = Path();
+    // path.moveTo(size.width * 0.1, 0);
+    path.moveTo(size.width * 0.3, size.height * 0.2);
+    path.lineTo(size.width, size.height * 0.2);
+    path.lineTo(size.width, size.height);
+    path.lineTo(0, size.height);
+    path.close();
+    return path;
+}
+
+@override
+bool shouldReclip(_TrapeziumClipper2 oldClipper) => false;
+}
+
+
+
+
+
diff --git a/bus_tracking/lib/pages/home_old.dart b/bus_tracking/lib/pages/home_old.dart
new file mode 100644
index 0000000..9264593
--- /dev/null
+++ b/bus_tracking/lib/pages/home_old.dart
@@ -0,0 +1,381 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:bus_tracking/config/url.dart';
+import 'package:bus_tracking/main.dart';
+import 'package:bus_tracking/models/locationKey.dart';
+import 'package:bus_tracking/models/logo.dart';
+import 'package:bus_tracking/models/spinner.dart';
+import 'package:bus_tracking/pages/location.dart';
+import 'package:bus_tracking/services/displayMap.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:http/http.dart' as http;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:uni_links/uni_links.dart';
+import 'package:bus_tracking/utils/busNoRegex.dart';
+
+class Home extends StatefulWidget {
+  const Home({Key? key}) : super(key: key);
+
+  @override
+  State<Home> createState() => _HomeState();
+}
+bool _initialURILinkHandled = false;
+
+
+
+
+class _HomeState extends State<Home> {
+
+  void _autoLogOut(String value){
+    var curTime = DateTime.now().millisecondsSinceEpoch;
+    var prev = DateTime.fromMillisecondsSinceEpoch(int.parse(value));
+    var cur = DateTime.fromMillisecondsSinceEpoch(curTime);
+    DateTime dt1 = DateTime.parse(cur.toString());
+    DateTime dt2 = DateTime.parse(prev.toString());
+    Duration diff = dt1.difference(dt2);
+
+
+    // ---------------Logout after 12 hours of trip generation ------------------------
+
+
+    if(diff.inHours.toInt() >= 12){
+      storage.deleteAll();
+    }
+
+  }
+
+
+
+  @override
+  void initState() {
+    // var curTime = DateTime.now().millisecondsSinceEpoch;
+    // storage.write(key: 'timeStamp',value: curTime.toString());
+    super.initState();
+  _initURIHandler();
+  _incomingLinkHandler();
+  // _storeTime();
+    // _locationController = StreamController();
+  }
+
+  Uri? _initialURI;
+  Uri? _currentURI;
+  Object? _err;
+  StreamSubscription? _streamSubscription;
+  void _incomingLinkHandler() {
+  // 1
+  if (!kIsWeb) {
+    // 2
+    _streamSubscription = uriLinkStream.listen((Uri? uri) {
+      if (!mounted) {
+        return;
+      }
+      debugPrint('Received URI: $uri');
+      setState(() {
+        _currentURI = uri;
+        _err = null;
+      });
+      // 3
+    }, onError: (Object err) {
+      if (!mounted) {
+        return;
+      }
+      debugPrint('Error occurred: $err');
+      setState(() {
+        _currentURI = null;
+        if (err is FormatException) {
+          _err = err;
+        } else {  
+          _err = null;
+        }
+      });
+    });
+  }
+  }
+
+  Future<void> _initURIHandler() async {
+ // 1
+  if (!_initialURILinkHandled) {
+    _initialURILinkHandled = true;
+    // 2
+    // Fluttertoast.showToast(
+    //     msg: "Invoked _initURIHandler",
+    //     toastLength: Toast.LENGTH_SHORT,
+    //     gravity: ToastGravity.BOTTOM,
+    //     timeInSecForIosWeb: 1,
+    //     backgroundColor: Colors.green,
+    //     textColor: Colors.white
+    // );
+    try {
+      // 3
+      final initialURI = await getInitialUri();
+      // 4
+      if (initialURI != null) {
+        debugPrint("Initial URI received $initialURI");
+        if (!mounted) {
+          return;
+        }
+        setState(() {
+          _initialURI = initialURI;
+        });
+      } else {
+        debugPrint("Null Initial URI received");
+      }
+    } on PlatformException { // 5
+      debugPrint("Failed to receive initial uri");
+    } on FormatException catch (err) { // 6
+      if (!mounted) {
+        return;
+      }
+      debugPrint('Malformed Initial URI received');
+      setState(() => _err = err);
+    }
+  }
+  }
+  String errorMsg = "Invalid Data";
+  Future<String?> isValidData(String phoneNo, String busNo) async {
+    final msg = jsonEncode({"number":phoneNo,"bus_no":busNo});
+      Map<String,String> headers = {'Content-Type':'application/json'};
+    var response = await http.post(
+      Uri.parse(getUrl() +  'get-key/'),
+      headers: headers,
+      body: msg,
+    );
+    
+    if(response.statusCode == 200){ 
+      // setState(() {
+      //   apiKey = jsonDecode(response.body)['key'].toString();
+      // });
+      setState(() {
+        _isTrackPressed = false;
+      });
+      return jsonDecode(response.body)['key'].toString();
+    
+    }
+    setState(() { 
+      errorMsg = jsonDecode(response.body)['message'].toString();
+      _isTrackPressed = false;
+    });
+    if(errorMsg == "null"){
+      setState(() {
+        errorMsg = "Invalid Data";
+      });
+    }
+
+    return null;
+  }
+  // @override
+  // void initState() {
+  // super.initState();
+  // // _initURIHandler();
+  // // _incomingLinkHandler();
+  // }
+
+  @override
+  void dispose()async{
+  _streamSubscription?.cancel();
+  // await _storeTime();
+  super.dispose();
+  }
+
+  TextEditingController phoneNoController = TextEditingController();
+  TextEditingController busNameController = TextEditingController();
+
+  bool _isTrackPressed = false;
+  var _formKey = GlobalKey<FormState>();
+
+  @override
+  Widget build(BuildContext context) {
+    return _isTrackPressed ? CustomSpinnerWithTitle : SafeArea(
+      child: GestureDetector(
+        onTap: () {
+          FocusManager.instance.primaryFocus?.unfocus();
+        },
+        child: Scaffold(
+          resizeToAvoidBottomInset : true,
+          backgroundColor: Colors.grey[200],
+          appBar: AppBar(
+            backgroundColor: Colors.blueGrey[800],
+            // backgroundColor: Color.fromARGB(255, 193, 72, 31),
+            title: Text('NWKRTC'),
+            centerTitle: true,
+            actions: [
+              
+              FloatingActionButton.extended(
+                onPressed: (){
+                 print('login button');
+                storage.read(key: 'timeStamp').then((value){
+                  if(value != null){
+                    print('value not null');
+                    _autoLogOut(value);
+                  }
+                });
+                // ignore: use_build_context_synchronously
+                Navigator.pushNamed(context, '/login');
+              }, 
+              icon: Icon(
+                Icons.login,
+                color: Colors.white,
+              ), label: Text('Login',style: TextStyle(color: Colors.white),),)
+            ],
+          ),
+          body: SingleChildScrollView(
+            reverse: true,
+            child: Padding(
+              padding: const EdgeInsets.all(15.0),
+              child: Form(
+                key: _formKey,
+                child: Column(
+                  children: <Widget>[
+                    //Logo
+                    mainLogo,
+                    Container(
+                        alignment: Alignment.center,
+                        padding: const EdgeInsets.all(15),
+                        child: const Text(
+                          'Track Your Bus',
+                          style: TextStyle(
+                              color:  Colors.black,
+                              fontWeight: FontWeight.w500,
+                              fontSize: 30),
+                        )),
+                    Container(
+                      padding: const EdgeInsets.all(15),
+                      child: TextFormField(
+                       keyboardType: TextInputType.number,
+                        controller: phoneNoController,
+                        maxLength: 10,
+                        
+                        validator: (value){
+                          if (value!.isEmpty || value.length != 10 ||
+                                !RegExp(r'^(?:(?:\+|0{0,2})91(\s*[\-]\s*)?|[0]?)?[6789]\d{9}$')
+                                    .hasMatch(value)) {
+                              return 'Enter a valid Mobile number';
+                            }
+                          return null;
+          
+                       },
+                      
+                        
+                        cursorColor: Colors.black,
+                        decoration: const InputDecoration(
+                          focusedBorder: OutlineInputBorder(
+                              borderRadius: BorderRadius.all(Radius.circular(4)),
+                              borderSide: BorderSide(width: 1,color: Colors.black),
+                            ),
+                            counter: SizedBox(
+                              width: 0,
+                              height: 0,
+                            ),
+                            
+                            border: OutlineInputBorder(),
+                            labelStyle: TextStyle(color: Colors.black),
+                          labelText: 'Conductor Number',
+                          
+                        ),
+                      ),
+                    ),
+                    Container(
+                      padding: const EdgeInsets.all(15),
+                      child: TextFormField(
+                        inputFormatters: [
+                          UpperCaseTextFormatter(),
+                          LengthLimitingTextInputFormatter(9),
+                        ],
+                        controller: busNameController,
+                        cursorColor: Colors.black,
+                        validator: (value){
+                          // if (value!.isEmpty ||
+                          //       !RegExp("^[A-Z]{1}[0-9]{4}\$")
+                          //           .hasMatch(value)) {
+                          //     return 'Enter a valid Bus No';
+                          //   }
+                            return null;
+                        },
+                        decoration: const InputDecoration(
+                          focusedBorder: OutlineInputBorder(
+                              borderRadius: BorderRadius.all(Radius.circular(4)),
+                              borderSide: BorderSide(width: 1,color: Colors.black),
+                            ),
+                            
+                            border: OutlineInputBorder(),
+                            labelStyle: TextStyle(color: Colors.black),
+                          labelText: 'Bus No',
+                        ),
+                      ),
+                    ),
+                    SizedBox(height: 20,),
+                    Container(
+                        height: 50,
+                        padding: const EdgeInsets.fromLTRB(10, 0, 10, 0),
+                        child: ElevatedButton(
+                          style: ElevatedButton.styleFrom(primary: Colors.blue[800] ),
+                          child: const Text('Track'),
+                          
+                          onPressed: () async {
+                            var phoneNo = phoneNoController.text.toString();
+                            var busNo = busNameController.text.toString();
+                           
+                            if(!_formKey.currentState!.validate()){
+                              return null;
+                            }
+                            //Spinner
+                            setState(() {
+                              _isTrackPressed = true;
+                            });
+                            // Navigator.pushNamed(context, '/location',arguments: locationData(phoneNo,busNo));
+                            var apiKey = await isValidData(phoneNo, busNo);
+                            if(apiKey != null && apiKey != "null") {
+                              Navigator.pushNamed(context, '/location',arguments: locationKey(apiKey, busNo));
+                            } else {
+                              // AlertDialog(
+                              //   content: Text('Error occured'),
+                              // );
+                              showDialog<String>(
+                              context: context,
+                              builder: (BuildContext context) => AlertDialog(
+                                // backgroundColor: Colors.redAccent[300],
+                                
+                                elevation: 1.0,
+                                title:  Center(child: Text(errorMsg)),
+                                // content:  Row(
+                                //   mainAxisAlignment: MainAxisAlignment.center,
+                                //   crossAxisAlignment: CrossAxisAlignment.center,
+                                //   children : <Widget>[
+                                //     Expanded(
+                                //       child: Text(
+                                //         'Invalid Data',
+                                //         textAlign: TextAlign.center,
+                                        
+                                //       ),
+                                //     )
+                                //   ],
+                                // ),                      
+                                actionsAlignment: MainAxisAlignment.center,
+                                actions: <Widget>[
+                                  TextButton(
+                                    onPressed: () => Navigator.pop(context, 'OK'),
+                                    child: const Text('OK',style: TextStyle(color: Color.fromARGB(255, 39, 91, 42)),),
+                                  ),
+                                ],
+                              ),
+                              );
+                          
+                            }
+                          },
+                        )
+                    )
+                  ]
+                ),
+              ),
+            ),
+          )
+        ),
+      ),
+    );
+  }
+}
+
+        
\ No newline at end of file
diff --git a/bus_tracking/lib/pages/sendLocation.dart b/bus_tracking/lib/pages/sendLocation.dart
index 3b9ab96..c0f192b 100644
--- a/bus_tracking/lib/pages/sendLocation.dart
+++ b/bus_tracking/lib/pages/sendLocation.dart
@@ -611,7 +611,7 @@ class _sendLocationState extends State<sendLocation> {
       appBar: AppBar(
       title: Text("NWKRTC"),
       actions: [
-                FlatButton.icon(onPressed: (){
+                FloatingActionButton.extended(onPressed: (){
                   storage.deleteAll();
                   timer?.cancel();
                   Navigator.pushReplacementNamed(context, '/');
@@ -682,7 +682,7 @@ class _sendLocationState extends State<sendLocation> {
             backgroundColor: Colors.blueGrey[800],
             title: Text('NWKRTC'),
             actions: [
-                FlatButton.icon(onPressed: (){
+                FloatingActionButton.extended(onPressed: (){
                   _stopForegroundTask();
                   storage.deleteAll();
                   Navigator.pushReplacementNamed(context, '/');
diff --git a/bus_tracking/lib/pages/splashScreen.dart b/bus_tracking/lib/pages/splashScreen.dart
new file mode 100644
index 0000000..e77a77a
--- /dev/null
+++ b/bus_tracking/lib/pages/splashScreen.dart
@@ -0,0 +1,36 @@
+import 'package:animated_splash_screen/animated_splash_screen.dart';
+import 'package:bus_tracking/pages/home.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/src/foundation/key.dart';
+import 'package:flutter/src/widgets/framework.dart';
+
+class splashScreen extends StatelessWidget {
+  const splashScreen({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+
+    return SafeArea(
+      child: Scaffold(
+        body: AnimatedSplashScreen(
+          splash: Icons.bus_alert, 
+          duration: 5000,
+          splashTransition: SplashTransition.fadeTransition,          
+          nextScreen: HomePage(),
+          backgroundColor: Colors.blue,
+        ),
+      ) 
+    );
+
+    // return MaterialApp(
+
+    //     title: 'Clean Code',
+    //     home: AnimatedSplashScreen(
+    //         duration: 3000,
+    //         splash: Icons.home,
+    //         nextScreen: HomePage(),
+    //         splashTransition: SplashTransition.fadeTransition,
+    //         // pageTransitionType: PageTransitionType.scale,
+    //         backgroundColor: Colors.blue));
+  }
+}
\ No newline at end of file
diff --git a/bus_tracking/pubspec.yaml b/bus_tracking/pubspec.yaml
index 9288174..4498aed 100644
--- a/bus_tracking/pubspec.yaml
+++ b/bus_tracking/pubspec.yaml
@@ -52,6 +52,9 @@ dependencies:
   intl: ^0.17.0
   flutter_spinkit: ^5.1.0
   android_intent_plus: ^3.1.5
+  url_launcher: ^6.1.10
+  app_settings: ^4.2.0
+  animated_splash_screen: ^1.3.0
 
 
 dev_dependencies:
@@ -64,7 +67,7 @@ dev_dependencies:
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
   flutter_lints: ^2.0.0
-  flutter_launcher_icons: "^0.10.0"
+  # flutter_launcher_icons: "^0.10.0"
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
@@ -87,11 +90,11 @@ flutter:
   assets:
     - assets/images/
 
-flutter_icons:
-  android: "launcher_icon"
-  ios: true
-  image_path: "assets/images/logo.png"
-  min_sdk_android: 21 # android min sdk min:16, default 21
+# flutter_icons:
+#   android: "launcher_icon"
+#   ios: true
+#   image_path: "assets/images/logo.png"
+#   min_sdk_android: 21 # android min sdk min:16, default 21
 
   # To add assets to your application, add an assets section, like this: