diff --git a/apps/mobile/apps/client/lib/src/widgets/session_listener.dart b/apps/mobile/apps/client/lib/src/widgets/session_listener.dart
index cbae1627..707d5cf7 100644
--- a/apps/mobile/apps/client/lib/src/widgets/session_listener.dart
+++ b/apps/mobile/apps/client/lib/src/widgets/session_listener.dart
@@ -104,7 +104,7 @@ class _SessionListenerState extends State<SessionListener> {
           actions: <Widget>[
             TextButton(
               onPressed: () {
-                Navigator.of(context).pop();
+                Modular.to.popSafe();
                 _proceedToLogin();
               },
               child: const Text('Log In'),
@@ -134,7 +134,7 @@ class _SessionListenerState extends State<SessionListener> {
             ),
             TextButton(
               onPressed: () {
-                Navigator.of(context).pop();
+                Modular.to.popSafe();;
                 _proceedToLogin();
               },
               child: const Text('Log Out'),
diff --git a/apps/mobile/apps/staff/lib/src/widgets/session_listener.dart b/apps/mobile/apps/staff/lib/src/widgets/session_listener.dart
index fa830a35..47d9fdd0 100644
--- a/apps/mobile/apps/staff/lib/src/widgets/session_listener.dart
+++ b/apps/mobile/apps/staff/lib/src/widgets/session_listener.dart
@@ -104,7 +104,7 @@ class _SessionListenerState extends State<SessionListener> {
           actions: <Widget>[
             TextButton(
               onPressed: () {
-                Navigator.of(context).pop();
+                Modular.to.popSafe();;
                 _proceedToLogin();
               },
               child: const Text('Log In'),
@@ -134,7 +134,7 @@ class _SessionListenerState extends State<SessionListener> {
             ),
             TextButton(
               onPressed: () {
-                Navigator.of(context).pop();
+                Modular.to.popSafe();;
                 _proceedToLogin();
               },
               child: const Text('Log Out'),
diff --git a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/coverage_report_page.dart b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/coverage_report_page.dart
index a307da37..54ba368b 100644
--- a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/coverage_report_page.dart
+++ b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/coverage_report_page.dart
@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_modular/flutter_modular.dart';
 import 'package:intl/intl.dart';
+import 'package:krow_core/core.dart';
 import 'package:krow_domain/krow_domain.dart';
 
 class CoverageReportPage extends StatefulWidget {
@@ -62,7 +63,7 @@ class _CoverageReportPageState extends State<CoverageReportPage> {
                           Row(
                             children: <Widget>[
                               GestureDetector(
-                                onTap: () => Navigator.of(context).pop(),
+                                onTap: () => Modular.to.popSafe(),
                                 child: Container(
                                   width: 40,
                                   height: 40,
diff --git a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/daily_ops_report_page.dart b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/daily_ops_report_page.dart
index 736237f7..15e4765f 100644
--- a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/daily_ops_report_page.dart
+++ b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/daily_ops_report_page.dart
@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_modular/flutter_modular.dart';
 import 'package:intl/intl.dart';
+import 'package:krow_core/core.dart';
 import 'package:krow_domain/krow_domain.dart';
 
 class DailyOpsReportPage extends StatefulWidget {
@@ -92,7 +93,7 @@ class _DailyOpsReportPageState extends State<DailyOpsReportPage> {
                           Row(
                             children: <Widget>[
                               GestureDetector(
-                                onTap: () => Navigator.of(context).pop(),
+                                onTap: () => Modular.to.popSafe(),
                                 child: Container(
                                   width: 40,
                                   height: 40,
@@ -434,7 +435,7 @@ class _OpsStatCard extends StatelessWidget {
                 ),
               ),
 
-              UiChip(label: subValue),
+              //UiChip(label: subValue),
               // Colored pill badge (matches prototype)
               Container(
                 padding: const EdgeInsets.symmetric(
@@ -443,12 +444,12 @@ class _OpsStatCard extends StatelessWidget {
                 ),
                 decoration: BoxDecoration(
                   color: color.withOpacity(0.12),
-                  borderRadius: BorderRadius.circular(20),
+                  borderRadius: BorderRadius.circular(4),
                 ),
                 child: Text(
                   subValue,
                   style: TextStyle(
-                    fontSize: 10,
+                    fontSize: 12,
                     fontWeight: FontWeight.bold,
                     color: color,
                   ),
diff --git a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/forecast_report_page.dart b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/forecast_report_page.dart
index e0495d80..a0479a67 100644
--- a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/forecast_report_page.dart
+++ b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/forecast_report_page.dart
@@ -2,6 +2,7 @@
 import 'package:client_reports/src/presentation/blocs/forecast/forecast_bloc.dart';
 import 'package:client_reports/src/presentation/blocs/forecast/forecast_event.dart';
 import 'package:client_reports/src/presentation/blocs/forecast/forecast_state.dart';
+import 'package:krow_core/core.dart';
 import 'package:krow_domain/krow_domain.dart';
 import 'package:core_localization/core_localization.dart';
 import 'package:design_system/design_system.dart';
@@ -85,7 +86,7 @@ class _ForecastReportPageState extends State<ForecastReportPage> {
                                 (ForecastWeek week) => _WeeklyBreakdownItem(week: week),
                               ),
 
-                            const SizedBox(height: 40),
+                            const SizedBox(height: UiConstants.space24),
                           ],
                         ),
                       ),
@@ -123,7 +124,7 @@ class _ForecastReportPageState extends State<ForecastReportPage> {
           Row(
             children: <Widget>[
               GestureDetector(
-                onTap: () => Navigator.of(context).pop(),
+                onTap: () => Modular.to.popSafe(),
                 child: Container(
                   width: 40,
                   height: 40,
@@ -183,6 +184,7 @@ class _ForecastReportPageState extends State<ForecastReportPage> {
     final TranslationsClientReportsForecastReportEn t = context.t.client_reports.forecast_report;
     return GridView.count(
       crossAxisCount: 2,
+      padding: EdgeInsets.zero,
       shrinkWrap: true,
       physics: const NeverScrollableScrollPhysics(),
       mainAxisSpacing: 12,
diff --git a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/no_show_report_page.dart b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/no_show_report_page.dart
index 91ec15c2..7cf962d2 100644
--- a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/no_show_report_page.dart
+++ b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/no_show_report_page.dart
@@ -1,4 +1,5 @@
 // ignore_for_file: always_specify_types, depend_on_referenced_packages, dead_code, dead_null_aware_expression, unused_local_variable, unused_import, sort_constructors_first, prefer_final_fields, prefer_const_constructors, deprecated_member_use, implicit_call_tearoffs
+import 'package:krow_core/core.dart';
 import 'package:krow_domain/krow_domain.dart';
 import 'package:client_reports/src/presentation/blocs/no_show/no_show_bloc.dart';
 import 'package:client_reports/src/presentation/blocs/no_show/no_show_event.dart';
@@ -66,7 +67,7 @@ class _NoShowReportPageState extends State<NoShowReportPage> {
                           Row(
                             children: <Widget>[
                               GestureDetector(
-                                onTap: () => Navigator.of(context).pop(),
+                                onTap: () => Modular.to.popSafe(),
                                 child: Container(
                                   width: 40,
                                   height: 40,
diff --git a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/performance_report_page.dart b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/performance_report_page.dart
index 2f7c8dd5..ccfd5169 100644
--- a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/performance_report_page.dart
+++ b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/performance_report_page.dart
@@ -6,6 +6,7 @@ import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_modular/flutter_modular.dart';
+import 'package:krow_core/core.dart';
 import 'package:krow_domain/krow_domain.dart';
 
 class PerformanceReportPage extends StatefulWidget {
@@ -141,7 +142,7 @@ class _PerformanceReportPageState extends State<PerformanceReportPage> {
                           Row(
                             children: <Widget>[
                               GestureDetector(
-                                onTap: () => Navigator.of(context).pop(),
+                                onTap: () => Modular.to.popSafe(),
                                 child: Container(
                                   width: 40,
                                   height: 40,
diff --git a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/spend_report_page.dart b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/spend_report_page.dart
index db5d39ba..7ba1eeb9 100644
--- a/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/spend_report_page.dart
+++ b/apps/mobile/packages/features/client/reports/lib/src/presentation/pages/spend_report_page.dart
@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_modular/flutter_modular.dart';
 import 'package:intl/intl.dart';
+import 'package:krow_core/core.dart';
 import 'package:krow_domain/krow_domain.dart';
 
 class SpendReportPage extends StatefulWidget {
@@ -34,7 +35,7 @@ class _SpendReportPageState extends State<SpendReportPage> {
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider(
+    return BlocProvider<SpendBloc>(
       create: (BuildContext context) => Modular.get<SpendBloc>()
         ..add(LoadSpendReport(startDate: _startDate, endDate: _endDate)),
       child: Scaffold(
@@ -70,7 +71,7 @@ class _SpendReportPageState extends State<SpendReportPage> {
                           Row(
                             children: <Widget>[
                               GestureDetector(
-                                onTap: () => Navigator.of(context).pop(),
+                                onTap: () => Modular.to.popSafe(),
                                 child: Container(
                                   width: 40,
                                   height: 40,
diff --git a/apps/mobile/packages/features/staff/authentication/lib/src/presentation/pages/phone_verification_page.dart b/apps/mobile/packages/features/staff/authentication/lib/src/presentation/pages/phone_verification_page.dart
index d70eb8ad..d4c3b652 100644
--- a/apps/mobile/packages/features/staff/authentication/lib/src/presentation/pages/phone_verification_page.dart
+++ b/apps/mobile/packages/features/staff/authentication/lib/src/presentation/pages/phone_verification_page.dart
@@ -155,7 +155,7 @@ class _PhoneVerificationPageState extends State<PhoneVerificationPage> {
                         BlocProvider.of<AuthBloc>(
                           context,
                         ).add(AuthResetRequested(mode: widget.mode));
-                        Navigator.of(context).pop();
+                        Modular.to.popSafe();;
                       },
                     ),
                     body: SafeArea(