diff --git a/lib/features/dashboard/dashboard_screen.dart b/lib/features/dashboard/dashboard_screen.dart
index 3e3222d..6d7b807 100644
--- a/lib/features/dashboard/dashboard_screen.dart
+++ b/lib/features/dashboard/dashboard_screen.dart
@@ -176,8 +176,9 @@ class DashboardScreen extends ConsumerWidget {
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                   children: [
-                    _buildDataBox(context, 'TRIP', '${session.tripDistanceMiles.toStringAsFixed(2)} MI'),
-                    _buildDataBox(context, 'TOP SPD', '${session.topSpeedMph.toStringAsFixed(0)} MPH'),
+                    Expanded(child: _buildDataBox(context, 'TRIP', '${session.tripDistanceMiles.toStringAsFixed(2)} MI')),
+                    const SizedBox(width: 4),
+                    Expanded(child: _buildDataBox(context, 'TOP SPD', '${session.topSpeedMph.toStringAsFixed(0)} MPH')),
                   ],
                 ),
               ],
@@ -206,8 +207,9 @@ class DashboardScreen extends ConsumerWidget {
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                   children: [
-                    _buildDataBox(context, 'AVG SPD', '${session.averageSpeedMph.toStringAsFixed(1)} MPH'),
-                    _buildDataBox(context, 'STATUS', session.state.name.toUpperCase()),
+                    Expanded(child: _buildDataBox(context, 'AVG SPD', '${session.averageSpeedMph.toStringAsFixed(1)} MPH')),
+                    const SizedBox(width: 4),
+                    Expanded(child: _buildDataBox(context, 'STATUS', session.state.name.toUpperCase())),
                   ],
                 ),
               ],
diff --git a/test/evolution_theme_test.dart b/test/evolution_theme_test.dart
index 264ceac..af2b384 100644
--- a/test/evolution_theme_test.dart
+++ b/test/evolution_theme_test.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -79,6 +79,10 @@ void main() {
     });
 
     testWidgets('EvolutionRecordsScreen renders speed records and performance times', (tester) async {
+      tester.view.physicalSize = const Size(1080, 2400);
+      tester.view.devicePixelRatio = 1.0;
+      addTearDown(() => tester.view.resetPhysicalSize());
+
       SharedPreferences.setMockInitialValues({});
       final prefs = await SharedPreferences.getInstance();