diff --git a/lib/presentation/habib_wallet/recharge_wallet_page.dart b/lib/presentation/habib_wallet/recharge_wallet_page.dart
index 02a9426..3196e93 100644
--- a/lib/presentation/habib_wallet/recharge_wallet_page.dart
+++ b/lib/presentation/habib_wallet/recharge_wallet_page.dart
@@ -171,19 +171,14 @@ class _RechargeWalletPageState extends State<RechargeWalletPage> {
                             Divider(color: AppColors.borderOnlyColor.withValues(alpha: 0.1), height: 1.h),
                             SizedBox(height: 16.h),
                             Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
-                                Row(
+                                Utils.buildSvgWithAssets(icon: AppAssets.email_icon, width: 40.h, height: 40.h),
+                                SizedBox(width: 8.h),
+                                Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
                                   children: [
-                                    Utils.buildSvgWithAssets(icon: AppAssets.email_icon, width: 40.h, height: 40.h),
-                                    SizedBox(width: 8.h),
-                                    Column(
-                                      crossAxisAlignment: CrossAxisAlignment.start,
-                                      children: [
-                                        LocaleKeys.email.tr(context: context).toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
-                                        "${appState.getAuthenticatedUser()!.emailAddress}".toText16(color: AppColors.textColor, weight: FontWeight.w500),
-                                      ],
-                                    ),
+                                    LocaleKeys.email.tr(context: context).toText12(color: AppColors.greyTextColor, fontWeight: FontWeight.w500),
+                                    "${appState.getAuthenticatedUser()!.emailAddress}".toText16(color: AppColors.textColor, weight: FontWeight.w500),
                                   ],
                                 ),
                               ],
diff --git a/lib/presentation/lab/lab_orders_page.dart b/lib/presentation/lab/lab_orders_page.dart
index 520bfec..d995757 100644
--- a/lib/presentation/lab/lab_orders_page.dart
+++ b/lib/presentation/lab/lab_orders_page.dart
@@ -13,6 +13,7 @@ import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart';
 import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/chip/custom_chip_widget.dart';
+import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
 import 'package:provider/provider.dart';
 
 import 'collapsing_list_view.dart';
@@ -50,7 +51,13 @@ class _LabOrdersPageState extends State<LabOrdersPage> {
             if (lavVM.isLabOrdersLoading) {
               return;
             } else {
-              String? value = await Navigator.of(context).push(CupertinoPageRoute(fullscreenDialog: true, builder: (context) => SearchLabResultsContent(labSuggestionsList: lavVM.labSuggestions)));
+              String? value = await Navigator.of(context).push(
+                CustomPageRoute(
+                  page: SearchLabResultsContent(labSuggestionsList: lavVM.labSuggestions),
+                  fullScreenDialog: true,
+                  direction: AxisDirection.down,
+                ),
+              );
               if (value != null) {
                 selectedFilterText = value;
                 lavVM.filterLabReports(value);
diff --git a/lib/widgets/routes/custom_page_route.dart b/lib/widgets/routes/custom_page_route.dart
index 733993f..475b2ee 100644
--- a/lib/widgets/routes/custom_page_route.dart
+++ b/lib/widgets/routes/custom_page_route.dart
@@ -2,14 +2,16 @@ import 'package:flutter/material.dart';
 import 'package:flutter/physics.dart';
 
 /// Reusable spring route
-class CustomPageRoute extends PageRouteBuilder {
+class CustomPageRoute<T> extends PageRouteBuilder<T> {
   final Widget page;
   final AxisDirection direction;
+  final bool fullScreenDialog;
 
-  CustomPageRoute({required this.page, this.direction = AxisDirection.right})
+  CustomPageRoute({required this.page, this.direction = AxisDirection.right, this.fullScreenDialog = false})
       : super(
           transitionDuration: const Duration(milliseconds: 1500),
           reverseTransitionDuration: const Duration(milliseconds: 500),
+          fullscreenDialog: fullScreenDialog,
           pageBuilder: (_, __, ___) => page,
           transitionsBuilder: (context, animation, secondaryAnimation, child) {
             final spring = SpringDescription(mass: 1, stiffness: 100, damping: 15);