diff --git a/android/app/src/main/res/drawable-hdpi/android12splash.png b/android/app/src/main/res/drawable-hdpi/android12splash.png
new file mode 100644
index 0000000..ae8e380
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
new file mode 100644
index 0000000..ae8e380
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/android12splash.png b/android/app/src/main/res/drawable-mdpi/android12splash.png
new file mode 100644
index 0000000..714f560
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
new file mode 100644
index 0000000..714f560
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/android/app/src/main/res/drawable-night-hdpi/android12splash.png
new file mode 100644
index 0000000..ae8e380
Binary files /dev/null and b/android/app/src/main/res/drawable-night-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/android/app/src/main/res/drawable-night-mdpi/android12splash.png
new file mode 100644
index 0000000..714f560
Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
new file mode 100644
index 0000000..056f298
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
new file mode 100644
index 0000000..866cdc2
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
new file mode 100644
index 0000000..13cea3e
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
new file mode 100644
index 0000000..7c8ecf7
Binary files /dev/null and b/android/app/src/main/res/drawable-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
index f74085f..3cc4948 100644
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>
diff --git a/android/app/src/main/res/drawable-xhdpi/android12splash.png b/android/app/src/main/res/drawable-xhdpi/android12splash.png
new file mode 100644
index 0000000..056f298
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
new file mode 100644
index 0000000..056f298
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxhdpi/android12splash.png
new file mode 100644
index 0000000..866cdc2
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
new file mode 100644
index 0000000..866cdc2
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
new file mode 100644
index 0000000..13cea3e
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png
new file mode 100644
index 0000000..13cea3e
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
new file mode 100644
index 0000000..7c8ecf7
Binary files /dev/null and b/android/app/src/main/res/drawable/background.png differ
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index 304732f..3cc4948 100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
new file mode 100644
index 0000000..0eed091
--- /dev/null
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#F95F62</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</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
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 06952be..dbc9ea9 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -5,6 +5,10 @@
         <!-- 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:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</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/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
new file mode 100644
index 0000000..0ff4baa
--- /dev/null
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#F95F62</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</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
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index cb1ef88..0d1fa8f 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -5,6 +5,10 @@
         <!-- 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:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</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/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
new file mode 100644
index 0000000..9f447e1
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
new file mode 100644
index 0000000..7c8ecf7
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
index 0bedcf2..00cabce 100644
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index 9da19ea..714f560 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index 9da19ea..056f298 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index 9da19ea..866cdc2 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
index f2e259c..613f863 100644
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -16,13 +16,19 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -32,6 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchImage" width="399" height="138"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index db05d91..41ac171 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,49 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Citycards Customer</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>citycards_customer</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-</dict>
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>Citycards Customer</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>citycards_customer</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>UIStatusBarHidden</key>
+		<false/>
+	</dict>
 </plist>
diff --git a/lib/cart/widget/ticket_card_view.dart b/lib/cart/widget/ticket_card_view.dart
index 7ce099f..a0e1c2a 100644
--- a/lib/cart/widget/ticket_card_view.dart
+++ b/lib/cart/widget/ticket_card_view.dart
@@ -14,26 +14,23 @@ class TicketCard extends StatelessWidget {
           clipper: TicketClipper(),
           child: Container(
             width: 270.w,
-            height: 410.h,
+            height: 400.h,
             padding: EdgeInsets.all(16.w),
             decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(12.r),
             ),
             child: Column(
               children: [
-                // Image Section
                 ClipRRect(
                   borderRadius: BorderRadius.circular(12.r),
                   child: Image.asset(
                     'assets/images/card_banner.png',
-                    width: double.infinity,
+                    width: 237.w,
                     height: 198.h,
                     fit: BoxFit.cover,
                   ),
                 ),
-                SizedBox(height: 24.h),
-
-                // Dashed divider
+                SizedBox(height: 20.h),
                 SizedBox(
                   width: 200.w,
                   child: DashedDivider(
@@ -41,7 +38,7 @@ class TicketCard extends StatelessWidget {
                     thickness: 2.h,
                   ),
                 ),
-
+                SizedBox(height: 6.h),
                 Text(
                   "Melbourne",
                   style: TextStyle(
@@ -49,7 +46,7 @@ class TicketCard extends StatelessWidget {
                     fontWeight: FontWeight.w500,
                   ),
                 ),
-                SizedBox(height: 12.h),
+                SizedBox(height: 6.h),
                 _infoRow("Postcards :", "5"),
                 _infoRow("Date :", "22/04/2025"),
                 _infoRow("Time :", "12:00PM - 2:00PM"),
@@ -84,36 +81,39 @@ class TicketCard extends StatelessWidget {
 class TicketPainter extends CustomPainter {
   @override
   void paint(Canvas canvas, Size size) {
-    const notchRadius = 23.0;
-    const dividerY = 222.0;
+    final notchRadius = 23.r;
+    final dividerY = 240.h;
 
     final ticketPath = Path()
-      ..moveTo(12, 0)
-      ..lineTo(size.width - 12, 0)
-      ..arcToPoint(Offset(size.width, 12), radius: const Radius.circular(12))
+      ..moveTo(12.w, 0)
+      ..lineTo(size.width - 12.w, 0)
+      ..arcToPoint(Offset(size.width, 12.h), radius: Radius.circular(12.r))
       ..lineTo(size.width, dividerY - notchRadius)
       ..arcToPoint(
         Offset(size.width, dividerY + notchRadius),
-        radius: const Radius.circular(notchRadius),
+        radius: Radius.circular(notchRadius),
         clockwise: false,
       )
-      ..lineTo(size.width, size.height - 12)
-      ..arcToPoint(Offset(size.width - 12, size.height),
-          radius: const Radius.circular(12))
-      ..lineTo(12, size.height)
-      ..arcToPoint(Offset(0, size.height - 12),
-          radius: const Radius.circular(12))
+      ..lineTo(size.width, size.height - 12.h)
+      ..arcToPoint(
+        Offset(size.width - 12.w, size.height),
+        radius: Radius.circular(12.r),
+      )
+      ..lineTo(12.w, size.height)
+      ..arcToPoint(
+        Offset(0, size.height - 12.h),
+        radius: Radius.circular(12.r),
+      )
       ..lineTo(0, dividerY + notchRadius)
       ..arcToPoint(
         Offset(0, dividerY - notchRadius),
-        radius: const Radius.circular(notchRadius),
+        radius: Radius.circular(notchRadius),
         clockwise: false,
       )
-      ..lineTo(0, 12)
-      ..arcToPoint(Offset(12, 0), radius: const Radius.circular(12))
+      ..lineTo(0, 12.h)
+      ..arcToPoint(Offset(12.w, 0), radius: Radius.circular(12.r))
       ..close();
 
-    // 🌑 Draw even soft black shadow around all sides
     final shadowPaint = Paint()
       ..color = Colors.black.withOpacity(0.3)
       ..maskFilter = const MaskFilter.blur(BlurStyle.outer, 8);
@@ -134,33 +134,37 @@ class TicketPainter extends CustomPainter {
 class TicketClipper extends CustomClipper<Path> {
   @override
   Path getClip(Size size) {
-    const notchRadius = 23.0;
-    const dividerY = 222.0;
+    final notchRadius = 23.r;
+    final dividerY = 240.h;
 
     final path = Path()
-      ..moveTo(12, 0)
-      ..lineTo(size.width - 12, 0)
-      ..arcToPoint(Offset(size.width, 12), radius: const Radius.circular(12))
+      ..moveTo(12.w, 0)
+      ..lineTo(size.width - 12.w, 0)
+      ..arcToPoint(Offset(size.width, 12.h), radius: Radius.circular(12.r))
       ..lineTo(size.width, dividerY - notchRadius)
       ..arcToPoint(
         Offset(size.width, dividerY + notchRadius),
-        radius: const Radius.circular(notchRadius),
+        radius: Radius.circular(notchRadius),
         clockwise: false,
       )
-      ..lineTo(size.width, size.height - 12)
-      ..arcToPoint(Offset(size.width - 12, size.height),
-          radius: const Radius.circular(12))
-      ..lineTo(12, size.height)
-      ..arcToPoint(Offset(0, size.height - 12),
-          radius: const Radius.circular(12))
+      ..lineTo(size.width, size.height - 12.h)
+      ..arcToPoint(
+        Offset(size.width - 12.w, size.height),
+        radius: Radius.circular(12.r),
+      )
+      ..lineTo(12.w, size.height)
+      ..arcToPoint(
+        Offset(0, size.height - 12.h),
+        radius: Radius.circular(12.r),
+      )
       ..lineTo(0, dividerY + notchRadius)
       ..arcToPoint(
         Offset(0, dividerY - notchRadius),
-        radius: const Radius.circular(notchRadius),
+        radius: Radius.circular(notchRadius),
         clockwise: false,
       )
-      ..lineTo(0, 12)
-      ..arcToPoint(Offset(12, 0), radius: const Radius.circular(12))
+      ..lineTo(0, 12.h)
+      ..arcToPoint(Offset(12.w, 0), radius: Radius.circular(12.r))
       ..close();
 
     return path;
diff --git a/lib/checkout/view/checkout_view.dart b/lib/checkout/view/checkout_view.dart
index c308708..4b5db4b 100644
--- a/lib/checkout/view/checkout_view.dart
+++ b/lib/checkout/view/checkout_view.dart
@@ -345,6 +345,7 @@ class CheckoutView extends StatelessWidget {
               CustomFilledButton(
                 onTap: () {
                   showModalBottomSheet(
+                    backgroundColor: Colors.white,
                     context: context,
                     isScrollControlled: true,
                     shape: RoundedRectangleBorder(
diff --git a/lib/checkout/widget/all_coupons_bottomsheet.dart b/lib/checkout/widget/all_coupons_bottomsheet.dart
index bb54b92..43ed068 100644
--- a/lib/checkout/widget/all_coupons_bottomsheet.dart
+++ b/lib/checkout/widget/all_coupons_bottomsheet.dart
@@ -71,7 +71,9 @@ class AllCouponsBottomsheet extends StatelessWidget {
                       GestureDetector(
                         onTap: (){
                           Navigator.pop(context);
-                          showModalBottomSheet(context: context,
+                          showModalBottomSheet(
+                            backgroundColor: Colors.white,
+                              context: context,
                               isScrollControlled: true,
                               shape: RoundedRectangleBorder(
                                 borderRadius: BorderRadius.vertical(
diff --git a/lib/checkout/widget/login_email_bottomsheet.dart b/lib/checkout/widget/login_email_bottomsheet.dart
index 18af4db..a330960 100644
--- a/lib/checkout/widget/login_email_bottomsheet.dart
+++ b/lib/checkout/widget/login_email_bottomsheet.dart
@@ -62,6 +62,7 @@ class LoginEmailBottomsheet extends StatelessWidget {
                 Navigator.pop(context);
                 showModalBottomSheet(
                   context: context,
+                  backgroundColor: Colors.white,
                   isScrollControlled: true,
                   shape: RoundedRectangleBorder(
                     borderRadius: BorderRadius.vertical(
diff --git a/lib/checkout/widget/purchase_details_bottomsheet.dart b/lib/checkout/widget/purchase_details_bottomsheet.dart
index 0fa7376..9665816 100644
--- a/lib/checkout/widget/purchase_details_bottomsheet.dart
+++ b/lib/checkout/widget/purchase_details_bottomsheet.dart
@@ -200,7 +200,9 @@ class PurchaseDetailsBottomsheet extends StatelessWidget {
 
                 // --- Proceed Button ---
                 CustomFilledButton(
-                  onTap: () {},
+                  onTap: () {
+                    Navigator.pop(context);
+                  },
                   label: "Proceed",
                   width: double.infinity,
                 ),
diff --git a/lib/checkout/widget/verify_otp_bottomsheet.dart b/lib/checkout/widget/verify_otp_bottomsheet.dart
index 792a3b7..74fb695 100644
--- a/lib/checkout/widget/verify_otp_bottomsheet.dart
+++ b/lib/checkout/widget/verify_otp_bottomsheet.dart
@@ -76,7 +76,9 @@ class VerifyOtpBottomsheet extends StatelessWidget {
 
             SizedBox(height: 42.h),
             CustomFilledButton(
-              onTap: () {},
+              onTap: () {
+                Navigator.pop(context);
+              },
               label: "Continue",
               width: double.infinity,
             ),
diff --git a/lib/common_packages/language_selection_bottomsheet.dart b/lib/common_packages/language_selection_bottomsheet.dart
index 7a20de5..d5c0685 100644
--- a/lib/common_packages/language_selection_bottomsheet.dart
+++ b/lib/common_packages/language_selection_bottomsheet.dart
@@ -87,6 +87,7 @@ class LanguageSelectionBottomsheet extends StatelessWidget {
 
                           showModalBottomSheet(
                             context: context,
+                            backgroundColor: Colors.white,
                             shape: RoundedRectangleBorder(
                               borderRadius: BorderRadius.vertical(
                                 top: Radius.circular(12.r),
diff --git a/lib/contact_us/contact_us_view.dart b/lib/contact_us/contact_us_view.dart
index ef83351..3620f0a 100644
--- a/lib/contact_us/contact_us_view.dart
+++ b/lib/contact_us/contact_us_view.dart
@@ -1,4 +1,5 @@
 import 'package:citycards_customer/common_packages/app_bar.dart';
+import 'package:citycards_customer/common_packages/back_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:citycards_customer/common_packages/custom_textfield.dart';
@@ -25,29 +26,8 @@ class ContactUsPage extends StatelessWidget {
             children: [
               // Header bar
               CommonAppBar(isWhiteLogo: false, isProfilePage: true),
-              SizedBox(height: 12.h),
-              Divider(height: 1.h, color: Color(0xFFD9D9D9)),
-              SizedBox(height: 22.h),
 
-              // Back + Title
-              Row(
-                children: [
-                  GestureDetector(
-                    onTap: () {
-                      Navigator.pop(context);
-                    },
-                    child: Icon(Icons.arrow_back, size: 24.sp),
-                  ),
-                  SizedBox(width: 8.w),
-                  Text(
-                    "Contact Us",
-                    style: TextStyle(
-                      fontSize: 12.sp,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                ],
-              ),
+              backWidget(context,"Contact Us", Colors.black),
               SizedBox(height: 22.h),
 
               CustomText(
diff --git a/lib/edit_profile/edit_profile_view.dart b/lib/edit_profile/edit_profile_view.dart
index 0c692cc..b6a2721 100644
--- a/lib/edit_profile/edit_profile_view.dart
+++ b/lib/edit_profile/edit_profile_view.dart
@@ -1,4 +1,5 @@
 import 'package:citycards_customer/common_packages/app_bar.dart';
+import 'package:citycards_customer/common_packages/back_widget.dart';
 import 'package:citycards_customer/common_packages/custom_textfield.dart';
 import 'package:flutter/material.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
@@ -25,29 +26,9 @@ class EditProfilePage extends StatelessWidget {
             children: [
               // Header
               CommonAppBar(isWhiteLogo: false, isProfilePage: true),
-              SizedBox(height: 12.h),
-              Divider(height: 1.h, color: Color(0xFFD9D9D9)),
-              SizedBox(height: 22.h),
 
               // Back + title
-              Row(
-                children: [
-                  GestureDetector(
-                    onTap: () {
-                      Navigator.pop(context);
-                    },
-                    child: Icon(Icons.arrow_back, size: 24.sp),
-                  ),
-                  SizedBox(width: 8.w),
-                  Text(
-                    "Edit Profile",
-                    style: TextStyle(
-                      fontSize: 12.sp,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                ],
-              ),
+              backWidget(context,"Edit Profile", Colors.black),
               SizedBox(height: 33.h),
 
               // Profile Image
diff --git a/lib/faq/faq_view.dart b/lib/faq/faq_view.dart
index d8174e0..d0e9ac8 100644
--- a/lib/faq/faq_view.dart
+++ b/lib/faq/faq_view.dart
@@ -1,4 +1,5 @@
 import 'package:citycards_customer/common_packages/app_bar.dart';
+import 'package:citycards_customer/common_packages/back_widget.dart';
 import 'package:citycards_customer/common_packages/custom_expansion_tile.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:flutter/material.dart';
@@ -19,33 +20,7 @@ class FaqPage extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 CommonAppBar(isWhiteLogo: false, isProfilePage: true),
-                SizedBox(
-                  height: 12.h,
-                ),
-                Divider(
-                  height: 1.h,
-                  color: Color(0xFFD9D9D9),
-                ),
-                 SizedBox(height: 22.h),
-
-                // Back + Title
-                Row(
-                  children: [
-                    GestureDetector(
-                        onTap: (){
-                          Navigator.pop(context);
-                        },
-                        child: Icon(Icons.arrow_back, size: 24.sp)),
-                    SizedBox(width: 8.w),
-                    Text(
-                      "FAQ",
-                      style: TextStyle(
-                        fontSize: 12.sp,
-                        fontWeight: FontWeight.w500,
-                      ),
-                    ),
-                  ],
-                ),
+                backWidget(context,"FAQ", Colors.black),
                 SizedBox(height: 34.h),
 
                 FAQSection(title: "🧭 General FAQs", faqs: generalFAQs),
diff --git a/lib/home/views/first_time_user_home_page.dart b/lib/home/views/first_time_user_home_page.dart
index 34c62a1..e4fff8e 100644
--- a/lib/home/views/first_time_user_home_page.dart
+++ b/lib/home/views/first_time_user_home_page.dart
@@ -1,4 +1,3 @@
-import 'package:citycards_customer/home/widgets/search_city_bottomsheet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
diff --git a/lib/main.dart b/lib/main.dart
index 216c347..68b805f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,4 +1,5 @@
 import 'package:citycards_customer/cart/blocs/postcard_bloc.dart';
+import 'package:citycards_customer/core/route_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -39,6 +40,7 @@ class MyApp extends StatelessWidget {
           ],
           child: MaterialApp(
             onGenerateRoute: _appRouter.onGenerateRoute,
+            initialRoute: RouteConstants.buyPass,
             debugShowCheckedModeBanner: false,
             title: 'City Cards',
             theme: ThemeData(
diff --git a/lib/privacy/privacy_view.dart b/lib/privacy/privacy_view.dart
index b3b4dfb..97afcee 100644
--- a/lib/privacy/privacy_view.dart
+++ b/lib/privacy/privacy_view.dart
@@ -1,4 +1,5 @@
 import 'package:citycards_customer/common_packages/app_bar.dart';
+import 'package:citycards_customer/common_packages/back_widget.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -16,29 +17,7 @@ class PrivacyPolicyPage extends StatelessWidget {
             child: Column(
               children: [
                 CommonAppBar(isWhiteLogo: false, isProfilePage: true),
-                SizedBox(height: 12.h),
-                Divider(height: 1.h, color: Color(0xFFD9D9D9)),
-                SizedBox(height: 22.h),
-
-                // Back + Title
-                Row(
-                  children: [
-                    GestureDetector(
-                      onTap: () {
-                        Navigator.pop(context);
-                      },
-                      child: Icon(Icons.arrow_back, size: 24.sp),
-                    ),
-                    SizedBox(width: 8.w),
-                    Text(
-                      "Privacy Policy",
-                      style: TextStyle(
-                        fontSize: 12.sp,
-                        fontWeight: FontWeight.w500,
-                      ),
-                    ),
-                  ],
-                ),
+                backWidget(context,"Privacy Policy", Colors.black),
                 SizedBox(height: 32.h),
                 CustomText(
                   text:
diff --git a/lib/profile/profile_page_view.dart b/lib/profile/profile_page_view.dart
index 7dee061..a80a87a 100644
--- a/lib/profile/profile_page_view.dart
+++ b/lib/profile/profile_page_view.dart
@@ -1,5 +1,6 @@
 import 'package:citycards_customer/common_bloc/language_selection_bloc.dart';
 import 'package:citycards_customer/common_packages/app_bar.dart';
+import 'package:citycards_customer/common_packages/back_widget.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:citycards_customer/common_packages/language_selection_bottomsheet.dart';
 import 'package:citycards_customer/core/route_constants.dart';
@@ -21,21 +22,8 @@ class ProfilePage extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               CommonAppBar(isWhiteLogo: false, isProfilePage: true),
-              SizedBox(height: 12.h),
-              Divider(height: 1.h, color: Color(0xFFD9D9D9)),
-              SizedBox(height: 22.h),
-              Row(
-                children: [
-                  GestureDetector(
-                    onTap: () {
-                      Navigator.pop(context);
-                    },
-                    child: Icon(Icons.arrow_back, size: 24.sp),
-                  ),
-                  SizedBox(width: 8.w),
-                  Text("My profile", style: TextStyle(fontSize: 12.sp)),
-                ],
-              ),
+              backWidget(context,"My Profile", Colors.black),
+
               SizedBox(height: 29.h),
               // Profile Image and Name
               Row(
@@ -106,6 +94,7 @@ class ProfilePage extends StatelessWidget {
                 onTap: () {
                   showModalBottomSheet(
                     context: context,
+                    backgroundColor: Colors.white,
                     shape: RoundedRectangleBorder(
                       borderRadius: BorderRadius.vertical(
                         top: Radius.circular(12.r),
diff --git a/lib/terms_and_condition/terms_and_condition_view.dart b/lib/terms_and_condition/terms_and_condition_view.dart
index c4af61c..34ade3b 100644
--- a/lib/terms_and_condition/terms_and_condition_view.dart
+++ b/lib/terms_and_condition/terms_and_condition_view.dart
@@ -1,4 +1,5 @@
 import 'package:citycards_customer/common_packages/app_bar.dart';
+import 'package:citycards_customer/common_packages/back_widget.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -16,29 +17,10 @@ class TermsAndCondition extends StatelessWidget {
             child: Column(
               children: [
                 CommonAppBar(isWhiteLogo: false, isProfilePage: true),
-                SizedBox(height: 12.h),
-                Divider(height: 1.h, color: Color(0xFFD9D9D9)),
-                SizedBox(height: 22.h),
+
 
                 // Back + Title
-                Row(
-                  children: [
-                    GestureDetector(
-                      onTap: () {
-                        Navigator.pop(context);
-                      },
-                      child: Icon(Icons.arrow_back, size: 24.sp),
-                    ),
-                    SizedBox(width: 8.w),
-                    Text(
-                      "Terms and Conditons",
-                      style: TextStyle(
-                        fontSize: 12.sp,
-                        fontWeight: FontWeight.w500,
-                      ),
-                    ),
-                  ],
-                ),
+                backWidget(context,"Terms and Conditions", Colors.black),
                 SizedBox(height: 32.h),
                 CustomText(
                   text:
diff --git a/pubspec.lock b/pubspec.lock
index 7fc3f82..a2295e1 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,6 +1,14 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
   archive:
     dependency: transitive
     description:
@@ -195,6 +203,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_native_splash:
+    dependency: "direct main"
+    description:
+      name: flutter_native_splash
+      sha256: "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.7"
   flutter_otp_text_field:
     dependency: "direct main"
     description:
@@ -786,6 +802,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
   uuid:
     dependency: transitive
     description:
@@ -842,6 +866,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.6.1"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
 sdks:
   dart: ">=3.9.0 <4.0.0"
   flutter: ">=3.35.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index befc6d6..2624c91 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -46,6 +46,7 @@ dependencies:
   equatable: ^2.0.7
   table_calendar: ^3.2.0
   syncfusion_flutter_calendar: ^31.2.4
+  flutter_native_splash: ^2.4.7
 
 dev_dependencies:
   flutter_test:
@@ -102,3 +103,10 @@ flutter:
   #
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/to/font-from-package
+flutter_native_splash:
+  color: "#F95F62"         # Background color (your coral red)
+  image: assets/logo/logo_city_cards_white.png   # Your splash logo
+  android_12:
+    color: "#F95F62"
+    image: assets/logo/logo_city_cards_white.png
+  web: false
\ No newline at end of file