.github/scripts/detect-android-changes.cjs

@@ -39,32 +39,12 @@ function isAppPath(filePath) {
   );
 }
 
-function isNativeBuildPath(filePath) {
-  const p = normalizePath(filePath);
-  if (!p) return false;
-  // Native build requires: Android code, CI-critical files, or build config.
-  // Only CI files that affect build behavior trigger release builds; doc/comment changes do not.
-  // Composite actions: only Android-specific actions (flutter-ci-setup) trigger builds.
-  return (
-    p.startsWith('android/') ||
-    p === '.github/workflows/android-build.yml' ||
-    p.startsWith('.github/scripts/') ||
-    p.startsWith('.github/actions/flutter-ci-setup/') ||
-    p === 'pubspec.yaml' ||
-    p === 'pubspec.lock' ||
-    p === 'analysis_options.yaml' ||
-    p === 'build.yaml'
-  );
-}
-
 function isCiPath(filePath) {
   const p = normalizePath(filePath);
   if (!p) return false;
-  // CI paths: workflows, scripts, and Android-specific composite actions.
   return (
     p === '.github/workflows/android-build.yml' ||
-    p.startsWith('.github/scripts/') ||
+    p.startsWith('.github/scripts/')
-    p.startsWith('.github/actions/flutter-ci-setup/')
   );
 }
 
@@ -73,7 +53,6 @@ function classifyFiles(fileList) {
     return {
       android_changed: false,
       app_changed: false,
-      native_build_changed: false,
       appFiles: [],
       ciFiles: [],
       unrelatedFiles: []
@@ -83,7 +62,6 @@ function classifyFiles(fileList) {
   const appFiles = [];
   const ciFiles = [];
   const unrelatedFiles = [];
-  const nativeBuildFiles = [];
 
   for (const rawFile of fileList) {
     const file = normalizePath(rawFile);
@@ -96,21 +74,14 @@ function classifyFiles(fileList) {
     } else {
       unrelatedFiles.push(file);
     }
-
-    // Track files that trigger native builds (Android code, CI, config)
-    if (isNativeBuildPath(file)) {
-      nativeBuildFiles.push(file);
-    }
   }
 
   const app_changed = appFiles.length > 0;
   const android_changed = appFiles.length > 0 || ciFiles.length > 0;
-  const native_build_changed = nativeBuildFiles.length > 0;
 
   return {
     android_changed,
     app_changed,
-    native_build_changed,
     appFiles,
     ciFiles,
     unrelatedFiles
@@ -153,7 +124,6 @@ function detectAndroidChanges({ eventName, baseSha, headSha, repoDir }, deps = {
     return {
       android_changed: true,
       app_changed: true,
-      native_build_changed: true,
       reason: 'Manual workflow_dispatch; full pipeline authorized',
       appFiles: [],
       ciFiles: [],
@@ -165,7 +135,6 @@ function detectAndroidChanges({ eventName, baseSha, headSha, repoDir }, deps = {
   if (!baseSha || isZeroSha(baseSha) || !isValidSha(baseSha)) {
     return {
       android_changed: true,
-      native_build_changed: true,
       app_changed: true,
       reason: `Zero, missing, or invalid base SHA (${baseSha}); failing safe to full build`,
       appFiles: [],
@@ -178,7 +147,6 @@ function detectAndroidChanges({ eventName, baseSha, headSha, repoDir }, deps = {
   if (!headSha || isZeroSha(headSha) || !isValidSha(headSha)) {
     return {
       android_changed: true,
-      native_build_changed: true,
       app_changed: true,
       reason: `Zero, missing, or invalid head SHA (${headSha}); failing safe to full build`,
       appFiles: [],
@@ -191,7 +159,6 @@ function detectAndroidChanges({ eventName, baseSha, headSha, repoDir }, deps = {
   if (baseSha.trim() === headSha.trim()) {
     return {
       android_changed: false,
-      native_build_changed: false,
       app_changed: false,
       reason: 'Base SHA and Head SHA are identical; no changes detected',
       appFiles: [],
@@ -207,7 +174,6 @@ function detectAndroidChanges({ eventName, baseSha, headSha, repoDir }, deps = {
   } catch (err) {
     return {
       android_changed: true,
-      native_build_changed: true,
       app_changed: true,
       reason: `Failed to retrieve git diff: ${err.message}; failing safe to full build`,
       appFiles: [],
@@ -245,7 +211,6 @@ function runCli() {
 
   console.log(`[detect-android-changes] android_changed=${result.android_changed}`);
   console.log(`[detect-android-changes] app_changed=${result.app_changed}`);
-  console.log(`[detect-android-changes] native_build_changed=${result.native_build_changed}`);
   console.log(`[detect-android-changes] Reason: ${result.reason}`);
 
   if (result.appFiles && result.appFiles.length > 0) {
@@ -273,7 +238,7 @@ function runCli() {
   if (githubOutput) {
     fs.appendFileSync(
       githubOutput,
-      `android_changed=${result.android_changed}\napp_changed=${result.app_changed}\nnative_build_changed=${result.native_build_changed}\n`
+      `android_changed=${result.android_changed}\napp_changed=${result.app_changed}\n`
     );
     console.log(`[detect-android-changes] Wrote outputs to GITHUB_OUTPUT.`);
   }
@@ -291,7 +256,6 @@ module.exports = {
   isZeroSha,
   isAppPath,
   isCiPath,
-  isNativeBuildPath,
   classifyFiles,
   getChangedFiles,
   detectAndroidChanges

.github/scripts/detect-android-changes.test.cjs

@@ -12,7 +12,6 @@ const {
   isZeroSha,
   isAppPath,
   isCiPath,
-  isNativeBuildPath,
   classifyFiles,
   getChangedFiles,
   detectAndroidChanges
@@ -72,37 +71,14 @@ describe('File Path Classification', () => {
     assert.strictEqual(isCiPath('.github/workflows/android-build.yml'), true);
     assert.strictEqual(isCiPath('.github/scripts/detect-android-changes.cjs'), true);
     assert.strictEqual(isCiPath('.github/scripts/detect-android-changes.test.cjs'), true);
-    assert.strictEqual(isCiPath('.github/actions/flutter-ci-setup/action.yml'), true);
-    assert.strictEqual(isCiPath('.github/actions/flutter-ci-setup/index.js'), true);
 
     // Negative matches for Android CI paths
     assert.strictEqual(isCiPath('.github/workflows/website-ci.yml'), false);
     assert.strictEqual(isCiPath('.github/workflows/backend-ci.yml'), false);
     assert.strictEqual(isCiPath('.github/workflows/waze-relay-ci.yml'), false);
     assert.strictEqual(isCiPath('.github/workflows/firebase-emulator-tests.yml'), false);
-    assert.strictEqual(isCiPath('.github/actions/website-deploy/action.yml'), false);
-    assert.strictEqual(isCiPath('.github/actions/other-action/index.js'), false);
     assert.strictEqual(isCiPath('.github/pull_request_template.md'), false);
   });
-
-  it('identifies native build paths correctly', () => {
-    assert.strictEqual(isNativeBuildPath('android/app/build.gradle'), true);
-    assert.strictEqual(isNativeBuildPath('.github/workflows/android-build.yml'), true);
-    assert.strictEqual(isNativeBuildPath('.github/scripts/detect-android-changes.cjs'), true);
-    assert.strictEqual(isNativeBuildPath('.github/actions/flutter-ci-setup/action.yml'), true);
-    assert.strictEqual(isNativeBuildPath('.github/actions/flutter-ci-setup/index.js'), true);
-    assert.strictEqual(isNativeBuildPath('pubspec.yaml'), true);
-    assert.strictEqual(isNativeBuildPath('pubspec.lock'), true);
-    assert.strictEqual(isNativeBuildPath('analysis_options.yaml'), true);
-    assert.strictEqual(isNativeBuildPath('build.yaml'), true);
-
-    // Negative matches for native build paths
-    assert.strictEqual(isNativeBuildPath('.github/workflows/website-ci.yml'), false);
-    assert.strictEqual(isNativeBuildPath('.github/actions/website-deploy/action.yml'), false);
-    assert.strictEqual(isNativeBuildPath('.github/actions/other-action/action.yml'), false);
-    assert.strictEqual(isNativeBuildPath('lib/main.dart'), false);
-    assert.strictEqual(isNativeBuildPath('website/app/page.tsx'), false);
-  });
 });
 
 describe('classifyFiles Scenarios', () => {
@@ -169,7 +145,6 @@ describe('classifyFiles Scenarios', () => {
     const result = classifyFiles(files);
     assert.strictEqual(result.android_changed, true);
     assert.strictEqual(result.app_changed, true);
-    assert.strictEqual(result.native_build_changed, false);
     assert.deepStrictEqual(result.appFiles, ['lib/telemetry/telemetry_service.dart']);
   });
 
@@ -193,7 +168,6 @@ describe('classifyFiles Scenarios', () => {
     const result = classifyFiles(files);
     assert.strictEqual(result.android_changed, true);
     assert.strictEqual(result.app_changed, true);
-    assert.strictEqual(result.native_build_changed, true);
   });
 
   it('classifies pubspec change as true', () => {
@@ -210,9 +184,7 @@ describe('classifyFiles Scenarios', () => {
 
   it('classifies analysis_options and build.yaml changes as true', () => {
     assert.strictEqual(classifyFiles(['analysis_options.yaml']).android_changed, true);
-    assert.strictEqual(classifyFiles(['analysis_options.yaml']).native_build_changed, true);
     assert.strictEqual(classifyFiles(['build.yaml']).android_changed, true);
-    assert.strictEqual(classifyFiles(['build.yaml']).native_build_changed, true);
   });
 
   it('classifies assets change as true', () => {
@@ -267,26 +239,6 @@ describe('classifyFiles Scenarios', () => {
     assert.strictEqual(result.android_changed, false);
     assert.strictEqual(result.app_changed, false);
   });
-
-  it('classifies composite action (flutter-ci-setup) change as android_changed=true, native_build_changed=true', () => {
-    const files = ['.github/actions/flutter-ci-setup/action.yml'];
-    const result = classifyFiles(files);
-    assert.strictEqual(result.android_changed, true);
-    assert.strictEqual(result.app_changed, false);
-    assert.strictEqual(result.native_build_changed, true);
-    assert.strictEqual(result.ciFiles.length, 1);
-    assert.deepStrictEqual(result.ciFiles, ['.github/actions/flutter-ci-setup/action.yml']);
-  });
-
-  it('classifies non-Android composite action (e.g., website-deploy) as false', () => {
-    const files = ['.github/actions/website-deploy/action.yml'];
-    const result = classifyFiles(files);
-    assert.strictEqual(result.android_changed, false);
-    assert.strictEqual(result.app_changed, false);
-    assert.strictEqual(result.native_build_changed, false);
-    assert.strictEqual(result.ciFiles.length, 0);
-    assert.strictEqual(result.unrelatedFiles.length, 1);
-  });
 });
 
 describe('detectAndroidChanges Workflow Event Logic', () => {
@@ -301,7 +253,6 @@ describe('detectAndroidChanges Workflow Event Logic', () => {
     });
     assert.strictEqual(result.android_changed, true);
     assert.strictEqual(result.app_changed, true);
-    assert.strictEqual(result.native_build_changed, true);
     assert.match(result.reason, /Manual workflow_dispatch/);
   });
 
@@ -615,271 +566,6 @@ describe('Workflow Scenario Matrix Verification', () => {
 
     assert.strictEqual(result.android_changed, true);
     assert.strictEqual(result.app_changed, true);
-    assert.strictEqual(result.native_build_changed, true);
-  });
-});
-
-describe('Release Job Gating (native_build_changed output)', () => {
-  const baseSha = '0000000000000000000000000000000000000001';
-  const headSha = '0000000000000000000000000000000000000002';
-
-  it('Dart-only changes skip release job (native_build_changed=false)', () => {
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['lib/main.dart', 'test/widget_test.dart', 'assets/icons/app.png'] });
-
-    assert.strictEqual(result.native_build_changed, false, 'Dart-only changes should skip release');
-    assert.strictEqual(result.app_changed, true, 'app_changed should still be true');
-  });
-
-  it('Android code changes trigger release job (native_build_changed=true)', () => {
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['android/app/build.gradle'] });
-
-    assert.strictEqual(result.native_build_changed, true, 'Android changes should trigger release');
-  });
-
-  it('CI-only changes (.github/) trigger release job (native_build_changed=true)', () => {
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['.github/workflows/other.yml', '.github/scripts/helper.sh'] });
-
-    assert.strictEqual(result.native_build_changed, true, 'CI changes should trigger release');
-  });
-
-  it('Config file changes (pubspec.yaml) trigger release job (native_build_changed=true)', () => {
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['pubspec.yaml'] });
-
-    assert.strictEqual(result.native_build_changed, true, 'pubspec.yaml changes should trigger release');
-  });
-
-  it('Build config changes (build.yaml) trigger release job (native_build_changed=true)', () => {
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['build.yaml'] });
-
-    assert.strictEqual(result.native_build_changed, true, 'build.yaml changes should trigger release');
-  });
-
-  it('Mixed Dart and Android changes trigger release job (native_build_changed=true)', () => {
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['lib/main.dart', 'android/app/build.gradle'] });
-
-    assert.strictEqual(result.native_build_changed, true, 'Mixed changes should trigger release');
-  });
-
-  it('Manual dispatch always triggers release job (native_build_changed=true)', () => {
-    const result = detectAndroidChanges({
-      eventName: 'workflow_dispatch',
-      baseSha: '',
-      headSha: ''
-    });
-
-    assert.strictEqual(result.native_build_changed, true, 'Manual dispatch should always trigger release');
-  });
-
-  it('Invalid base SHA fails safe to trigger release (native_build_changed=true)', () => {
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha: 'invalid',
-      headSha
-    }, { getChangedFilesFn: () => ['lib/main.dart'] });
-
-    assert.strictEqual(result.native_build_changed, true, 'Invalid SHA should fail safe to trigger release');
-  });
-
-  it('Unrelated changes (docs/, website/) skip release job (native_build_changed=false)', () => {
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['docs/readme.md', 'website/index.html'] });
-
-    assert.strictEqual(result.native_build_changed, false, 'Unrelated changes should skip release');
-  });
-
-  it('dependency changes (pubspec.lock) trigger release job (native_build_changed=true)', () => {
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['pubspec.lock'] });
-
-    assert.strictEqual(result.native_build_changed, true, 'pubspec.lock changes should trigger release');
-  });
-});
-
-describe('GitHub Actions Workflow Output Wiring and Release Job Conditions', () => {
-  const baseSha = '03446911949ff8b27543280bfe226d9babd6fd7a';
-  const headSha = '247ccde71e4378dacd45121c891f45aad5ed2424';
-
-  it('detector outputs native_build_changed for GitHub Actions output file', () => {
-    // Simulate the detector writing to GITHUB_OUTPUT
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['lib/main.dart'] });
-
-    // The detector MUST set native_build_changed=false for Dart-only changes
-    assert.strictEqual(result.native_build_changed, false, 'Dart-only should set native_build_changed=false');
-    assert.strictEqual(result.android_changed, true, 'But android_changed=true still drives heavy build');
-  });
-
-  it('workflow release condition evaluates correctly: Dart-only changes skip release', () => {
-    // Simulate GitHub Actions condition: if: needs.detect.outputs.native_build_changed == 'true' && github.ref == 'refs/heads/master'
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['lib/main.dart', 'test/widget_test.dart'] });
-
-    // Release job condition evaluates to false
-    const nativeBuildChanged = result.native_build_changed;
-    const onMaster = true; // github.ref == 'refs/heads/master'
-    const releaseJobShouldRun = nativeBuildChanged && onMaster;
-
-    assert.strictEqual(nativeBuildChanged, false, 'Dart-only should output false');
-    assert.strictEqual(releaseJobShouldRun, false, 'Release job should NOT run for Dart-only');
-  });
-
-  it('workflow release condition evaluates correctly: Android changes run release', () => {
-    // Simulate GitHub Actions condition: if: needs.detect.outputs.native_build_changed == 'true' && github.ref == 'refs/heads/master'
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['android/app/build.gradle'] });
-
-    // Release job condition evaluates to true
-    const nativeBuildChanged = result.native_build_changed;
-    const onMaster = true; // github.ref == 'refs/heads/master'
-    const releaseJobShouldRun = nativeBuildChanged && onMaster;
-
-    assert.strictEqual(nativeBuildChanged, true, 'Android changes should output true');
-    assert.strictEqual(releaseJobShouldRun, true, 'Release job SHOULD run for Android changes');
-  });
-
-  it('workflow release condition evaluates correctly: CI-critical changes run release', () => {
-    // Simulate GitHub Actions condition: if: needs.detect.outputs.native_build_changed == 'true' && github.ref == 'refs/heads/master'
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['.github/workflows/android-build.yml'] });
-
-    // Release job condition evaluates to true
-    const nativeBuildChanged = result.native_build_changed;
-    const onMaster = true; // github.ref == 'refs/heads/master'
-    const releaseJobShouldRun = nativeBuildChanged && onMaster;
-
-    assert.strictEqual(nativeBuildChanged, true, 'CI-critical changes should output true');
-    assert.strictEqual(releaseJobShouldRun, true, 'Release job SHOULD run for CI-critical changes');
-  });
-
-  it('workflow release condition evaluates correctly: Config changes run release', () => {
-    // Simulate GitHub Actions condition: if: needs.detect.outputs.native_build_changed == 'true' && github.ref == 'refs/heads/master'
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['pubspec.yaml'] });
-
-    // Release job condition evaluates to true
-    const nativeBuildChanged = result.native_build_changed;
-    const onMaster = true; // github.ref == 'refs/heads/master'
-    const releaseJobShouldRun = nativeBuildChanged && onMaster;
-
-    assert.strictEqual(nativeBuildChanged, true, 'Config changes should output true');
-    assert.strictEqual(releaseJobShouldRun, true, 'Release job SHOULD run for config changes');
-  });
-
-  it('workflow release condition evaluates correctly: Unrelated changes skip release', () => {
-    // Simulate GitHub Actions condition: if: needs.detect.outputs.native_build_changed == 'true' && github.ref == 'refs/heads/master'
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['docs/readme.md', 'website/app.tsx'] });
-
-    // Release job condition evaluates to false
-    const nativeBuildChanged = result.native_build_changed;
-    const onMaster = true; // github.ref == 'refs/heads/master'
-    const releaseJobShouldRun = nativeBuildChanged && onMaster;
-
-    assert.strictEqual(nativeBuildChanged, false, 'Unrelated changes should output false');
-    assert.strictEqual(releaseJobShouldRun, false, 'Release job should NOT run for unrelated changes');
-  });
-
-  it('workflow release condition evaluates correctly: Composite action changes run release', () => {
-    // flutter-ci-setup is a composite action used by analysis, test, and debug APK jobs
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['.github/actions/flutter-ci-setup/action.yml'] });
-
-    const nativeBuildChanged = result.native_build_changed;
-    const onMaster = true; // github.ref == 'refs/heads/master'
-    const releaseJobShouldRun = nativeBuildChanged && onMaster;
-
-    assert.strictEqual(nativeBuildChanged, true, 'Composite action changes should output true');
-    assert.strictEqual(releaseJobShouldRun, true, 'Release job SHOULD run for composite action changes');
-  });
-
-  it('workflow release condition evaluates correctly: Non-Android composite action (website-deploy) skips release', () => {
-    const result = detectAndroidChanges({
-      eventName: 'push',
-      baseSha,
-      headSha
-    }, { getChangedFilesFn: () => ['.github/actions/website-deploy/action.yml'] });
-
-    const nativeBuildChanged = result.native_build_changed;
-    const onMaster = true; // github.ref == 'refs/heads/master'
-    const releaseJobShouldRun = nativeBuildChanged && onMaster;
-
-    assert.strictEqual(nativeBuildChanged, false, 'Non-Android composite actions should output false');
-    assert.strictEqual(releaseJobShouldRun, false, 'Release job should NOT run for non-Android actions');
-  });
-});
-
-describe('Workflow YAML Verification', () => {
-  it('verifies android-build.yml defines jobs.detect.outputs.native_build_changed', () => {
-    const workflowPath = '.github/workflows/android-build.yml';
-    const workflowContent = fs.readFileSync(path.join(process.cwd(), workflowPath), 'utf8');
-
-    // Check that the workflow file exists and contains the output mapping
-    assert.ok(workflowContent.includes('native_build_changed'),
-      'Workflow must expose native_build_changed output from detector step');
-    assert.ok(workflowContent.includes('steps.detector.outputs.native_build_changed'),
-      'Workflow must reference detector output with ${{ steps.detector.outputs.native_build_changed }}');
-  });
-
-  it('verifies release job condition includes native_build_changed check', () => {
-    const workflowPath = '.github/workflows/android-build.yml';
-    const workflowContent = fs.readFileSync(path.join(process.cwd(), workflowPath), 'utf8');
-
-    // Check that release job condition references the output
-    assert.ok(workflowContent.includes("needs.detect.outputs.native_build_changed == 'true'"),
-      'Release job condition must check native_build_changed output');
-    assert.ok(workflowContent.includes('refs/heads/master'),
-      'Release job condition must ensure it only runs on master branch');
   });
 });
 

.github/workflows/android-build.yml

@@ -30,7 +30,6 @@ jobs:
     outputs:
       android_changed: ${{ steps.detector.outputs.android_changed }}
       app_changed: ${{ steps.detector.outputs.app_changed }}
-      native_build_changed: ${{ steps.detector.outputs.native_build_changed }}
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -242,7 +241,7 @@ jobs:
     name: Build signed release APK and AAB
     runs-on: ubuntu-latest
     needs: [detect, analyze-and-build]
-    if: (github.ref == 'refs/heads/master') && (github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && needs.detect.outputs.native_build_changed == 'true'))
+    if: (github.ref == 'refs/heads/master') && (github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && needs.detect.outputs.app_changed == 'true'))
     permissions:
       contents: read
     steps:

lib/core/widgets/hybrid_riding_action_bar.dart

@@ -223,8 +223,6 @@ class HybridRidingActionBar extends ConsumerWidget {
                   fit: BoxFit.scaleDown,
                   child: Text(
                     finishLabel ?? 'Finish Ride',
-                    maxLines: 1,
-                    softWrap: false,
                     style: const TextStyle(
                       fontFamily: AppTypography.fontHeadline,
                       fontSize: 15,
@@ -240,6 +238,7 @@ class HybridRidingActionBar extends ConsumerWidget {
       );
     }
 
+
     // Ready / Standby state: Single prominent start button
     return SizedBox(
       width: double.infinity,
@@ -254,24 +253,18 @@ class HybridRidingActionBar extends ConsumerWidget {
             borderRadius: BorderRadius.circular(14),
           ),
           elevation: 0,
-          padding: EdgeInsets.symmetric(horizontal: compact ? 8 : 12),
         ),
         onPressed: () {
           notifier.startRide();
         },
-        icon: Icon(Icons.play_arrow_rounded, size: compact ? 22 : 26, color: colors.brandCyan),
+        icon: Icon(Icons.play_arrow_rounded, size: 26, color: colors.brandCyan),
-        label: const FittedBox(
+        label: const Text(
-          fit: BoxFit.scaleDown,
+          'Start Session',
-          child: Text(
+          style: TextStyle(
-            'Start Session',
+            fontFamily: AppTypography.fontHeadline,
-            maxLines: 1,
+            fontSize: 17,
-            softWrap: false,
+            fontWeight: FontWeight.w700,
-            style: TextStyle(
+            letterSpacing: 0.5,
-              fontFamily: AppTypography.fontHeadline,
-              fontSize: 17,
-              fontWeight: FontWeight.w700,
-              letterSpacing: 0.5,
-            ),
           ),
         ),
       ),

lib/core/widgets/main_layout.dart

@@ -138,48 +138,45 @@ class _MainLayoutState extends ConsumerState<MainLayout> {
                         minHeight: constraints.maxHeight,
                       ),
                       child: IntrinsicHeight(
-                        child: () {
+                        child: NavigationRail(
-                          final isShortRail = constraints.maxHeight < 400;
+                          minWidth: 58,
-                          return NavigationRail(
+                          groupAlignment: 0.0,
-                            minWidth: isShortRail ? 52 : 58,
+                          selectedIndex: selectedIndex,
-                            groupAlignment: isShortRail ? -1.0 : 0.0,
+                          onDestinationSelected: _onDestinationSelected,
-                            selectedIndex: selectedIndex,
+                          backgroundColor: colors.surfaceCanvas,
-                            onDestinationSelected: _onDestinationSelected,
+                          indicatorColor: colors.brandCyan.withValues(alpha: 0.14),
-                            backgroundColor: colors.surfaceCanvas,
+                          selectedIconTheme: IconThemeData(
-                            indicatorColor: colors.brandCyan.withValues(alpha: 0.14),
+                            color: colors.brandCyan,
-                            selectedIconTheme: IconThemeData(
+                            size: 21,
-                              color: colors.brandCyan,
+                          ),
-                              size: isShortRail ? 19 : 21,
+                          unselectedIconTheme: IconThemeData(
-                            ),
+                            color: colors.textMuted,
-                            unselectedIconTheme: IconThemeData(
+                            size: 19,
-                              color: colors.textMuted,
+                          ),
-                              size: isShortRail ? 17 : 19,
+                          selectedLabelTextStyle: TextStyle(
-                            ),
+                            fontFamily: AppTypography.fontHeadline,
-                            selectedLabelTextStyle: TextStyle(
+                            fontSize: 10.0,
-                              fontFamily: AppTypography.fontHeadline,
+                            fontWeight: FontWeight.w700,
-                              fontSize: isShortRail ? 9.0 : 10.0,
+                            color: colors.brandCyan,
-                              fontWeight: FontWeight.w700,
+                          ),
-                              color: colors.brandCyan,
+                          unselectedLabelTextStyle: TextStyle(
-                            ),
+                            fontFamily: AppTypography.fontHeadline,
-                            unselectedLabelTextStyle: TextStyle(
+                            fontSize: 9.5,
-                              fontFamily: AppTypography.fontHeadline,
+                            fontWeight: FontWeight.w500,
-                              fontSize: isShortRail ? 8.5 : 9.5,
+                            color: colors.textMuted,
-                              fontWeight: FontWeight.w500,
+                          ),
-                              color: colors.textMuted,
+                          labelType: NavigationRailLabelType.all,
-                            ),
+                          destinations: kAppNavDestinations.map((dest) {
-                            labelType: NavigationRailLabelType.all,
+                            return NavigationRailDestination(
-                            destinations: kAppNavDestinations.map((dest) {
+                              padding: const EdgeInsets.symmetric(vertical: 4),
-                              return NavigationRailDestination(
+                              icon: Icon(dest.icon, key: dest.railKey),
-                                padding: EdgeInsets.symmetric(vertical: isShortRail ? 1 : 4),
+                              selectedIcon: dest.selectedIcon != null
-                                icon: Icon(dest.icon, key: dest.railKey),
+                                  ? Icon(dest.selectedIcon, key: dest.railKey)
-                                selectedIcon: dest.selectedIcon != null
+                                  : null,
-                                    ? Icon(dest.selectedIcon, key: dest.railKey)
+                              label: Text(dest.label),
-                                    : null,
+                            );
-                                label: Text(dest.label),
+                          }).toList(),
-                              );
+                        ),
-                            }).toList(),
-                          );
-                        }(),
                       ),
                     ),
                   ),

lib/features/dashboard/widgets/lean_angle_indicator.dart

@@ -233,7 +233,6 @@ class LeanAngleIndicator extends ConsumerWidget {
               // Header
               Text(
                 'LEAN ANGLE',
-                key: const ValueKey('lean_angle_title'),
                 style: TextStyle(
                   color: onSurfaceVariant,
                   fontSize: compact ? 9 : 11,
@@ -241,25 +240,22 @@ class LeanAngleIndicator extends ConsumerWidget {
                   letterSpacing: 1.2,
                 ),
               ),
-              SizedBox(height: compact ? 3 : 6),
+              SizedBox(height: compact ? 1 : 3),
 
               // Motorcycle Leaning Silhouette with Stable Horizon
               RepaintBoundary(
                 child: SizedBox(
-                  key: const ValueKey('lean_angle_rider_graphic'),
                   width: gaugeWidth,
                   height: gaugeHeight,
-                  child: ClipRect(
+                  child: CustomPaint(
-                    child: CustomPaint(
+                    size: Size(gaugeWidth, gaugeHeight),
-                      size: Size(gaugeWidth, gaugeHeight),
+                    painter: _MotorcycleLeanPainter(
-                      painter: _MotorcycleLeanPainter(
+                      leanAngle: displayLean,
-                        leanAngle: displayLean,
+                      motorcycleColor: isDark ? const Color(0xFF1E293B) : const Color(0xFFE2E8F0),
-                        motorcycleColor: isDark ? const Color(0xFF1E293B) : const Color(0xFFE2E8F0),
+                      accentColor: colors.brandCyan,
-                        accentColor: colors.brandCyan,
+                      horizonColor: isDark ? Colors.white24 : Colors.black26,
-                        horizonColor: isDark ? Colors.white24 : Colors.black26,
+                      tickColor: colors.brandCyan,
-                        tickColor: colors.brandCyan,
+                      isDark: isDark,
-                        isDark: isDark,
-                      ),
                     ),
                   ),
                 ),
@@ -430,10 +426,6 @@ class _MotorcycleLeanPainter extends CustomPainter {
     // 2. Draw Leaning Motorcycle Silhouette
     canvas.save();
     canvas.translate(contactPoint.dx, contactPoint.dy);
-    // Scale silhouette to fit comfortably below the top edge of the gauge
-    final availableTopSpace = horizonY - 4.0;
-    final double scale = (availableTopSpace / 47.5).clamp(0.5, 0.95);
-    canvas.scale(scale);
     final clampedLean = leanAngle.clamp(-60.0, 60.0);
     canvas.rotate(clampedLean * math.pi / 180.0);
 

lib/features/dashboard/widgets/responsive_dashboard_layout.dart

@@ -326,29 +326,17 @@ class ResponsiveDashboardLayout extends ConsumerWidget {
             child: Column(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                const FittedBox(
+                const Row(
-                  fit: BoxFit.scaleDown,
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  child: Row(
+                  children: [
-                    mainAxisSize: MainAxisSize.min,
+                    DashboardLayoutSwitcher(),
-                    children: [
+                    GPSStatusIndicator(showLabel: false),
-                      DashboardLayoutSwitcher(),
+                    HeadingIndicator(compact: true),
-                      SizedBox(width: 4),
+                    RideStatusChip(),
-                      QuickSwarmReportButton(compact: true),
+                  ],
-                      SizedBox(width: 4),
-                      QuickSquadFeedButton(compact: true),
-                      SizedBox(width: 4),
-                      GPSStatusIndicator(showLabel: false),
-                      SizedBox(width: 4),
-                      HeadingIndicator(compact: true),
-                      SizedBox(width: 4),
-                      RideStatusChip(),
-                    ],
-                  ),
                 ),
-                const Expanded(
+                const Center(
-                  child: Center(
+                  child: SpeedReadout(size: SpeedReadoutSize.compact),
-                    child: SpeedReadout(size: SpeedReadoutSize.compact),
-                  ),
                 ),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceAround,
@@ -398,7 +386,7 @@ class ResponsiveDashboardLayout extends ConsumerWidget {
             child: Center(child: SpeedReadout(size: SpeedReadoutSize.hero)),
           ),
           SizedBox(
-            width: 164,
+            width: 140,
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
@@ -475,10 +463,6 @@ class ResponsiveDashboardLayout extends ConsumerWidget {
                   children: [
                     DashboardLayoutSwitcher(),
                     SizedBox(width: 4),
-                    QuickSwarmReportButton(compact: true),
-                    SizedBox(width: 4),
-                    QuickSquadFeedButton(compact: true),
-                    SizedBox(width: 4),
                     GPSStatusIndicator(),
                     SizedBox(width: 4),
                     HeadingIndicator(compact: true),
@@ -488,9 +472,7 @@ class ResponsiveDashboardLayout extends ConsumerWidget {
                 ),
               ),
               const NavigationManeuverCard(compact: true),
-              const Expanded(
+              const Center(child: SpeedReadout(size: SpeedReadoutSize.compact)),
-                child: Center(child: SpeedReadout(size: SpeedReadoutSize.compact)),
-              ),
               const RideActionButton(compact: true),
               const SizedBox(height: 4),
               const PerformanceLaunchShortcut(compact: true),

lib/features/garage/garage_screen.dart

@@ -112,17 +112,14 @@ class GarageScreen extends ConsumerWidget {
               if (isMultiColumn) {
                 return GridView.builder(
                   padding: const EdgeInsets.all(16.0),
-                  gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
+                  gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
-                    maxCrossAxisExtent: responsive.isShortViewport ? 600 : 550,
+                    maxCrossAxisExtent: 550,
-                    mainAxisExtent: responsive.isShortViewport ? 300 : 420,
+                    mainAxisExtent: 420,
                     crossAxisSpacing: 16,
                     mainAxisSpacing: 16,
                   ),
-                  itemCount: bikes.length + 1,
+                  itemCount: bikes.length,
                   itemBuilder: (context, index) {
-                    if (index == bikes.length) {
-                      return _buildAddMotorcycleCard(context, ref, bikes);
-                    }
                     return _buildMotorcycleCard(context, ref, bikes[index], colors, isGrid: true);
                   },
                 );
@@ -130,11 +127,8 @@ class GarageScreen extends ConsumerWidget {
 
               return ListView.builder(
                 padding: const EdgeInsets.all(16.0),
-                itemCount: bikes.length + 1,
+                itemCount: bikes.length,
                 itemBuilder: (context, index) {
-                  if (index == bikes.length) {
-                    return _buildAddMotorcycleCard(context, ref, bikes);
-                  }
                   return _buildMotorcycleCard(context, ref, bikes[index], colors, isGrid: false);
                 },
               );
@@ -142,6 +136,19 @@ class GarageScreen extends ConsumerWidget {
           );
         },
       ),
+      floatingActionButton: bikesAsync.value != null && bikesAsync.value!.isNotEmpty
+          ? FloatingActionButton.extended(
+              key: const ValueKey('garage_add_motorcycle_fab'),
+              backgroundColor: colors.cyberCyan,
+              foregroundColor: Colors.black,
+              icon: const Icon(Icons.two_wheeler),
+              label: const Text(
+                'Add Motorcycle',
+                style: TextStyle(fontWeight: FontWeight.w600, letterSpacing: 0.2),
+              ),
+              onPressed: () => _onAddMotorcycle(context, ref, bikesAsync.value),
+            )
+          : null,
     );
   }
 
@@ -166,27 +173,6 @@ class GarageScreen extends ConsumerWidget {
     context.push('/garage/add');
   }
 
-  Widget _buildAddMotorcycleCard(
-    BuildContext context,
-    WidgetRef ref,
-    List<GarageMotorcycle> bikes,
-  ) {
-    final colors = context.motorColors;
-    return Card(
-      child: Center(
-        child: OutlinedButton.icon(
-          icon: const Icon(Icons.add),
-          label: const Text('Add Motorcycle'),
-          style: OutlinedButton.styleFrom(
-            foregroundColor: colors.cyberCyan,
-            side: BorderSide(color: colors.cyberCyan.withValues(alpha: 0.6)),
-          ),
-          onPressed: () => _onAddMotorcycle(context, ref, bikes),
-        ),
-      ),
-    );
-  }
-
   Widget _buildEmptyState(
     BuildContext context,
     MotorSignalThemeColors colors,
@@ -320,7 +306,7 @@ class GarageScreen extends ConsumerWidget {
                   year: bike.year,
                   make: bike.makeName,
                   model: bike.modelName,
-                  height: isGrid ? 100 : 150,
+                  height: 150,
                   borderRadius: BorderRadius.circular(10),
                 ),
                 const SizedBox(height: 12),

lib/features/garage/motorcycle_detail_screen.dart

@@ -1207,29 +1207,17 @@ class MotorcycleDetailScreen extends ConsumerWidget {
       builder: (context) {
         return StatefulBuilder(
           builder: (context, setState) {
-            final size = MediaQuery.sizeOf(context);
-            final viewInsets = MediaQuery.viewInsetsOf(context);
             return AlertDialog(
-              scrollable: true,
-              constraints: BoxConstraints(
-                maxWidth: 560,
-                maxHeight: size.height - viewInsets.bottom - 48,
-              ),
               title: const Text('Log New Service'),
-              content: Column(
+              content: SingleChildScrollView(
+                child: Column(
                   mainAxisSize: MainAxisSize.min,
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     DropdownButtonFormField<String>(
                       initialValue: selectedType,
-                      isExpanded: true,
                       decoration: const InputDecoration(labelText: 'Service Type'),
-                      items: serviceTypes
+                      items: serviceTypes.map((t) => DropdownMenuItem(value: t, child: Text(t))).toList(),
-                          .map((t) => DropdownMenuItem(
-                                value: t,
-                                child: Text(t, maxLines: 1, overflow: TextOverflow.ellipsis),
-                              ))
-                          .toList(),
                       onChanged: (val) {
                         if (val != null) setState(() => selectedType = val);
                       },
@@ -1280,6 +1268,7 @@ class MotorcycleDetailScreen extends ConsumerWidget {
                     ),
                   ],
                 ),
+              ),
               actions: [
                 TextButton(onPressed: () => Navigator.pop(context), child: const Text('Cancel')),
                 ElevatedButton(
@@ -1351,14 +1340,8 @@ class MotorcycleDetailScreen extends ConsumerWidget {
                   children: [
                     DropdownButtonFormField<String>(
                       initialValue: selectedType,
-                      isExpanded: true,
                       decoration: const InputDecoration(labelText: 'Service Type'),
-                      items: serviceTypes
+                      items: serviceTypes.map((t) => DropdownMenuItem(value: t, child: Text(t))).toList(),
-                          .map((t) => DropdownMenuItem(
-                                value: t,
-                                child: Text(t, maxLines: 1, overflow: TextOverflow.ellipsis),
-                              ))
-                          .toList(),
                       onChanged: (val) {
                         if (val != null) setState(() => selectedType = val);
                       },

lib/features/group_rides/create_group_ride_screen.dart

@@ -378,11 +378,8 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
     final onSurface = theme.colorScheme.onSurface;
     final onSurfaceVariant = theme.colorScheme.onSurfaceVariant;
 
-    FocusScope.of(context).unfocus();
-
     showModalBottomSheet(
       context: context,
-      isScrollControlled: true,
       backgroundColor: colors.surfaceContainerHigh,
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
@@ -391,112 +388,91 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
         return Consumer(
           builder: (context, ref, _) {
             final routesAsync = ref.watch(userRoutesProvider(user.uid));
-            final viewportSize = MediaQuery.sizeOf(sheetCtx);
-            final viewInsets = MediaQuery.viewInsetsOf(sheetCtx);
-            final isCompact = viewportSize.height < 480 || viewInsets.bottom > 0;
-            final availableHeight = (viewportSize.height - viewInsets.bottom)
-                .clamp(120.0, viewportSize.height);
             return SafeArea(
               child: Padding(
-                padding: EdgeInsets.only(bottom: viewInsets.bottom),
+                padding: const EdgeInsets.all(16),
-                child: ConstrainedBox(
+                child: Column(
-                  constraints: BoxConstraints(
+                  mainAxisSize: MainAxisSize.min,
-                    maxHeight: availableHeight * 0.9,
+                  crossAxisAlignment: CrossAxisAlignment.start,
-                    maxWidth: 560,
+                  children: [
-                  ),
+                    Text(
-                  child: SingleChildScrollView(
+                      'USE EXISTING ROUTE',
-                    padding: EdgeInsets.fromLTRB(
+                      style: TextStyle(
-                      16,
+                        color: onSurface,
-                      isCompact ? 12 : 16,
+                        fontWeight: FontWeight.bold,
-                      16,
+                        fontSize: 16,
-                      isCompact ? 12 : 16,
+                      ),
                     ),
-                    child: Column(
+                    const SizedBox(height: 8),
-                      mainAxisSize: MainAxisSize.min,
+                    Text(
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                      'Pre-fills title, meetup location, intermediate waypoints, and destination.',
-                      children: [
+                      style: TextStyle(color: onSurfaceVariant, fontSize: 12),
-                        Text(
+                    ),
-                          'USE EXISTING ROUTE',
+                    const SizedBox(height: 12),
-                        style: TextStyle(
+                    routesAsync.when(
-                          color: onSurface,
+                      loading: () => Center(
-                          fontWeight: FontWeight.bold,
+                        child: Padding(
-                          fontSize: 16,
+                          padding: const EdgeInsets.all(24),
+                          child:
+                              CircularProgressIndicator(color: colors.cyberCyan),
                         ),
                       ),
-                      const SizedBox(height: 6),
+                      error: (err, _) => Text(
-                      Text(
+                        'Failed to load routes: $err',
-                        'Pre-fills title, meetup location, intermediate waypoints, and destination.',
+                        style: TextStyle(color: colors.raceRed),
-                        style: TextStyle(color: onSurfaceVariant, fontSize: 12),
                       ),
-                      const SizedBox(height: 10),
+                      data: (routes) {
-                      routesAsync.when(
+                        if (routes.isEmpty) {
-                        loading: () => Center(
+                          return Padding(
-                          child: Padding(
+                            padding: const EdgeInsets.symmetric(vertical: 24),
-                            padding: EdgeInsets.all(isCompact ? 12 : 24),
+                            child: Center(
-                            child: CircularProgressIndicator(
+                              child: Text(
-                                color: colors.cyberCyan),
+                                'No saved routes found.',
-                          ),
+                                style: TextStyle(color: onSurfaceVariant),
-                        ),
-                        error: (err, _) => Text(
-                          'Failed to load routes: $err',
-                          style: TextStyle(color: colors.raceRed),
-                        ),
-                        data: (routes) {
-                          if (routes.isEmpty) {
-                            return Padding(
-                              padding: EdgeInsets.symmetric(
-                                  vertical: isCompact ? 12 : 24),
-                              child: Center(
-                                child: Text(
-                                  'No saved routes found.',
-                                  style: TextStyle(color: onSurfaceVariant),
-                                ),
                               ),
-                            );
-                          }
-                          return ConstrainedBox(
-                            constraints: BoxConstraints(
-                              maxHeight: availableHeight * 0.5,
-                            ),
-                            child: ListView.builder(
-                              shrinkWrap: true,
-                              itemCount: routes.length,
-                              itemBuilder: (ctx, idx) {
-                                final route = routes[idx];
-                                return ListTile(
-                                  dense: isCompact,
-                                  leading: Icon(Icons.alt_route,
-                                      color: colors.cyberCyan),
-                                  title: Text(
-                                    route.title,
-                                    style: TextStyle(
-                                        color: onSurface,
-                                        fontWeight: FontWeight.bold),
-                                  ),
-                                  subtitle: Text(
-                                    '${route.orderedStops.length} stops • ${route.formattedDistanceMiles}',
-                                    style: TextStyle(
-                                        color: onSurfaceVariant, fontSize: 12),
-                                  ),
-                                  onTap: () {
-                                    Navigator.pop(sheetCtx);
-                                    _applySavedRoute(route);
-                                  },
-                                );
-                              },
                             ),
                           );
-                        },
+                        }
-                      ),
+                        return ConstrainedBox(
-                    ],
+                          constraints: BoxConstraints(
-                  ),
+                            maxHeight: MediaQuery.of(context).size.height * 0.4,
+                          ),
+                          child: ListView.builder(
+                            shrinkWrap: true,
+                            itemCount: routes.length,
+                            itemBuilder: (ctx, idx) {
+                              final route = routes[idx];
+                              return ListTile(
+                                leading: Icon(Icons.alt_route,
+                                    color: colors.cyberCyan),
+                                title: Text(
+                                  route.title,
+                                  style: TextStyle(
+                                      color: onSurface,
+                                      fontWeight: FontWeight.bold),
+                                ),
+                                subtitle: Text(
+                                  '${route.orderedStops.length} stops • ${route.formattedDistanceMiles}',
+                                  style: TextStyle(
+                                      color: onSurfaceVariant, fontSize: 12),
+                                ),
+                                onTap: () {
+                                  Navigator.pop(sheetCtx);
+                                  _applySavedRoute(route);
+                                },
+                              );
+                            },
+                          ),
+                        );
+                      },
+                    ),
+                  ],
                 ),
               ),
-            ),
+            );
-          );
+          },
-        },
+        );
-      );
+      },
-    },
     );
   }
 
@@ -533,34 +509,9 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
           final theme = Theme.of(ctx);
           final onSurface = theme.colorScheme.onSurface;
           final onSurfaceVariant = theme.colorScheme.onSurfaceVariant;
-          final screenSize = MediaQuery.sizeOf(ctx);
-          final isCompactDialog = screenSize.height < 480;
 
           return AlertDialog(
-            scrollable: true,
             backgroundColor: colors.surfaceContainerHigh,
-            insetPadding: EdgeInsets.symmetric(
-              horizontal: 16,
-              vertical: isCompactDialog ? 8 : 24,
-            ),
-            titlePadding: EdgeInsets.fromLTRB(
-              20,
-              isCompactDialog ? 12 : 20,
-              20,
-              0,
-            ),
-            contentPadding: EdgeInsets.fromLTRB(
-              20,
-              isCompactDialog ? 10 : 16,
-              20,
-              isCompactDialog ? 8 : 16,
-            ),
-            actionsPadding: EdgeInsets.fromLTRB(
-              16,
-              0,
-              16,
-              isCompactDialog ? 8 : 16,
-            ),
             shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(16),
               side: BorderSide(color: colors.outlineVariant),
@@ -569,8 +520,7 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
               existing != null ? 'Edit Intermediate Stop' : 'Add Intermediate Stop',
               style: TextStyle(color: onSurface, fontSize: 16, fontWeight: FontWeight.bold),
             ),
-            content: ConstrainedBox(
+            content: SingleChildScrollView(
-              constraints: const BoxConstraints(maxWidth: 440),
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -591,7 +541,6 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
                   const SizedBox(height: 12),
                   TextField(
                     controller: nameCtrl,
-                    scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
                     style: TextStyle(color: onSurface),
                     decoration: InputDecoration(
                       labelText: 'Custom Stop Label (Optional)',
@@ -640,7 +589,6 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
                   const SizedBox(height: 12),
                   TextField(
                     controller: notesCtrl,
-                    scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
                     style: TextStyle(color: onSurface),
                     decoration: InputDecoration(
                       labelText: 'Notes (optional)',
@@ -750,14 +698,11 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
       }
     }
 
-    final isCompactScreen = MediaQuery.sizeOf(context).height < 500;
-
     return Scaffold(
       backgroundColor: colors.surfaceContainer,
       appBar: AppBar(
         backgroundColor: colors.surfaceContainerHigh,
         elevation: 0,
-        toolbarHeight: isCompactScreen ? 46 : kToolbarHeight,
         title: Text(
           widget.clubId != null ? 'CREATE CLUB RIDE' : 'CREATE GROUP RIDE',
           style: const TextStyle(
@@ -793,37 +738,18 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
           ),
         ],
       ),
-      body: SafeArea(
+      body: Form(
-        top: false,
+        key: _formKey,
-        child: Form(
+        child: ResponsiveLayout(
-          key: _formKey,
+          builder: (context, snapshot) {
-          child: ResponsiveLayout(
+            final isWide = snapshot.sizeClass == WindowSizeClass.expanded ||
-            builder: (context, snapshot) {
+                (snapshot.isLandscape && snapshot.width >= 720);
-              final isWide = snapshot.sizeClass == WindowSizeClass.expanded ||
-                  (snapshot.isLandscape && snapshot.width >= 600);
 
-              if (isWide) {
+            if (isWide) {
-                return _buildWideForm(
+              return _buildWideForm(context, colors, snapshot, canSubmit, clubAsync, memberAsync, clubValidationError);
-                  context,
+            }
-                  colors,
+            return _buildCompactForm(context, colors, snapshot, canSubmit, clubAsync, memberAsync, clubValidationError);
-                  snapshot,
+          },
-                  canSubmit,
-                  clubAsync,
-                  memberAsync,
-                  clubValidationError,
-                );
-              }
-              return _buildCompactForm(
-                context,
-                colors,
-                snapshot,
-                canSubmit,
-                clubAsync,
-                memberAsync,
-                clubValidationError,
-              );
-            },
-          ),
         ),
       ),
     );
@@ -838,65 +764,52 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
     AsyncValue<ClubMember?>? memberAsync,
     String? clubValidationError,
   ) {
-    final isCompact = snapshot.isLandscape || snapshot.isShortViewport;
+    return SingleChildScrollView(
-    final sectionGap = isCompact ? 12.0 : 24.0;
+      padding: const EdgeInsets.all(24),
-    final outerPadding = isCompact
+      child: Column(
-        ? const EdgeInsets.symmetric(horizontal: 16, vertical: 10)
+        crossAxisAlignment: CrossAxisAlignment.stretch,
-        : const EdgeInsets.all(24);
+        children: [
-    final colGap = isCompact ? 16.0 : 24.0;
+          if (widget.clubId != null)
-
+            _buildClubAffiliationHeader(colors, clubAsync, memberAsync, clubValidationError),
-    return Scrollbar(
+          if (_errorMessage != null) _buildErrorBanner(colors),
-      thumbVisibility: isCompact,
+          Row(
-      child: SingleChildScrollView(
+            crossAxisAlignment: CrossAxisAlignment.start,
-        keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
+            children: [
-        padding: outerPadding,
+              // Left Column: Details, Schedule, Privacy
-        child: Column(
+              Expanded(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
+                flex: 5,
-          children: [
+                child: Column(
-            if (widget.clubId != null)
+                  crossAxisAlignment: CrossAxisAlignment.start,
-              _buildClubAffiliationHeader(
+                  children: [
-                  colors, clubAsync, memberAsync, clubValidationError),
+                    _buildRideDetailsSection(colors),
-            if (_errorMessage != null) _buildErrorBanner(colors),
+                    const SizedBox(height: 24),
-            Row(
+                    _buildScheduleSection(colors),
-              crossAxisAlignment: CrossAxisAlignment.start,
+                    const SizedBox(height: 24),
-              children: [
+                    _buildPrivacySection(colors),
-                // Left Column: Details, Schedule, Privacy
+                  ],
-                Expanded(
-                  flex: 5,
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      _buildRideDetailsSection(colors, isCompact: isCompact),
-                      SizedBox(height: sectionGap),
-                      _buildScheduleSection(colors, isCompact: isCompact),
-                      SizedBox(height: sectionGap),
-                      _buildPrivacySection(colors, isCompact: isCompact),
-                    ],
-                  ),
                 ),
-                SizedBox(width: colGap),
+              ),
-                // Right Column: Meeting Point, Destination & Stops, Preview, Submit
+              const SizedBox(width: 24),
-                Expanded(
+              // Right Column: Meeting Point, Destination & Stops, Preview, Submit
-                  flex: 5,
+              Expanded(
-                  child: Column(
+                flex: 5,
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                child: Column(
-                    children: [
+                  crossAxisAlignment: CrossAxisAlignment.start,
-                      _buildMeetingPointSection(colors, isCompact: isCompact),
+                  children: [
-                      SizedBox(height: sectionGap),
+                    _buildMeetingPointSection(colors),
-                      _buildDestinationAndStopsSection(colors,
+                    const SizedBox(height: 24),
-                          isCompact: isCompact),
+                    _buildDestinationAndStopsSection(colors),
-                      SizedBox(height: sectionGap),
+                    const SizedBox(height: 24),
-                      _buildMapPreviewSection(colors, snapshot),
+                    _buildMapPreviewSection(colors, snapshot),
-                      SizedBox(height: sectionGap),
+                    const SizedBox(height: 24),
-                      _buildSubmitButton(colors, canSubmit),
+                    _buildSubmitButton(colors, canSubmit),
-                    ],
+                  ],
-                  ),
                 ),
-              ],
+              ),
-            ),
+            ],
-            SizedBox(height: isCompact ? 16 : 32),
+          ),
-          ],
+          const SizedBox(height: 32),
-        ),
+        ],
       ),
     );
   }
@@ -910,37 +823,27 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
     AsyncValue<ClubMember?>? memberAsync,
     String? clubValidationError,
   ) {
-    final isCompact = snapshot.isShortViewport;
+    return ListView(
-    final sectionGap = isCompact ? 14.0 : 24.0;
+      padding: const EdgeInsets.all(20),
-    return Scrollbar(
+      children: [
-      thumbVisibility: isCompact,
+        if (widget.clubId != null)
-      child: SingleChildScrollView(
+          _buildClubAffiliationHeader(colors, clubAsync, memberAsync, clubValidationError),
-        keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
+        if (_errorMessage != null) _buildErrorBanner(colors),
-        padding: EdgeInsets.all(isCompact ? 14 : 20),
+        _buildRideDetailsSection(colors),
-        child: Column(
+        const SizedBox(height: 24),
-          crossAxisAlignment: CrossAxisAlignment.stretch,
+        _buildScheduleSection(colors),
-          children: [
+        const SizedBox(height: 24),
-            if (widget.clubId != null)
+        _buildMeetingPointSection(colors),
-              _buildClubAffiliationHeader(
+        const SizedBox(height: 24),
-                  colors, clubAsync, memberAsync, clubValidationError),
+        _buildDestinationAndStopsSection(colors),
-            if (_errorMessage != null) _buildErrorBanner(colors),
+        const SizedBox(height: 24),
-            _buildRideDetailsSection(colors, isCompact: isCompact),
+        _buildMapPreviewSection(colors, snapshot),
-            SizedBox(height: sectionGap),
+        const SizedBox(height: 24),
-            _buildScheduleSection(colors, isCompact: isCompact),
+        _buildPrivacySection(colors),
-            SizedBox(height: sectionGap),
+        const SizedBox(height: 32),
-            _buildMeetingPointSection(colors, isCompact: isCompact),
+        _buildSubmitButton(colors, canSubmit),
-            SizedBox(height: sectionGap),
+        const SizedBox(height: 32),
-            _buildDestinationAndStopsSection(colors, isCompact: isCompact),
+      ],
-            SizedBox(height: sectionGap),
-            _buildMapPreviewSection(colors, snapshot),
-            SizedBox(height: sectionGap),
-            _buildPrivacySection(colors, isCompact: isCompact),
-            SizedBox(height: isCompact ? 16 : 32),
-            _buildSubmitButton(colors, canSubmit),
-            SizedBox(height: isCompact ? 16 : 32),
-          ],
-        ),
-      ),
     );
   }
 
@@ -955,8 +858,8 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
 
     if (clubAsync == null || memberAsync == null || clubAsync.isLoading || memberAsync.isLoading) {
       return Container(
-        margin: const EdgeInsets.only(bottom: 14),
+        margin: const EdgeInsets.only(bottom: 20),
-        padding: const EdgeInsets.all(12),
+        padding: const EdgeInsets.all(14),
         decoration: BoxDecoration(
           color: colors.surfaceContainerHigh,
           borderRadius: BorderRadius.circular(12),
@@ -990,8 +893,8 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
 
     if (validationError != null) {
       return Container(
-        margin: const EdgeInsets.only(bottom: 14),
+        margin: const EdgeInsets.only(bottom: 20),
-        padding: const EdgeInsets.all(12),
+        padding: const EdgeInsets.all(14),
         decoration: BoxDecoration(
           color: colors.raceRed.withValues(alpha: 0.12),
           borderRadius: BorderRadius.circular(12),
@@ -1034,8 +937,8 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
     final member = memberAsync.value;
 
     return Container(
-      margin: const EdgeInsets.only(bottom: 14),
+      margin: const EdgeInsets.only(bottom: 20),
-      padding: const EdgeInsets.all(14),
+      padding: const EdgeInsets.all(16),
       decoration: BoxDecoration(
         color: colors.surfaceContainerHigh,
         borderRadius: BorderRadius.circular(12),
@@ -1098,7 +1001,7 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
               ),
             ],
           ),
-          const SizedBox(height: 8),
+          const SizedBox(height: 10),
           Text(
             'This ride will be affiliated with ${club?.name ?? 'the club'}. Club members can discover it on the club page. Note: Club members are not automatically added as participants.',
             style: TextStyle(
@@ -1114,7 +1017,7 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
 
   Widget _buildErrorBanner(MotorSignalThemeColors colors) {
     return Container(
-      margin: const EdgeInsets.only(bottom: 12),
+      margin: const EdgeInsets.only(bottom: 16),
       padding: const EdgeInsets.all(12),
       decoration: BoxDecoration(
         color: colors.raceRed.withValues(alpha: 0.15),
@@ -1136,25 +1039,19 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
     );
   }
 
-  Widget _buildRideDetailsSection(
+  Widget _buildRideDetailsSection(MotorSignalThemeColors colors) {
-    MotorSignalThemeColors colors, {
-    bool isCompact = false,
-  }) {
-    final fieldGap = isCompact ? 8.0 : 12.0;
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         _buildSectionHeader('1. RIDE DETAILS', colors),
-        SizedBox(height: isCompact ? 6 : 10),
+        const SizedBox(height: 10),
         TextFormField(
           controller: _titleController,
-          scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
           style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
           decoration: _inputDecoration(
             'Ride Title',
             'e.g. Blood Mountain Loop',
             colors,
-            isCompact: isCompact,
           ),
           validator: (v) {
             if (v == null || v.trim().length < 3) {
@@ -1163,58 +1060,50 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
             return null;
           },
         ),
-        SizedBox(height: fieldGap),
+        const SizedBox(height: 12),
         TextFormField(
           controller: _descriptionController,
-          scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
           style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
-          maxLines: isCompact ? 2 : 3,
+          maxLines: 3,
           decoration: _inputDecoration(
             'Description & Route Notes',
             'Pace, skill level, gear recommendations...',
             colors,
-            isCompact: isCompact,
           ),
         ),
       ],
     );
   }
 
-  Widget _buildScheduleSection(
+  Widget _buildScheduleSection(MotorSignalThemeColors colors) {
-    MotorSignalThemeColors colors, {
-    bool isCompact = false,
-  }) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         _buildSectionHeader('2. DATE & SCHEDULE', colors),
-        SizedBox(height: isCompact ? 6 : 10),
+        const SizedBox(height: 10),
         Card(
-          margin: EdgeInsets.zero,
           color: colors.surfaceContainerHigh,
           shape: RoundedRectangleBorder(
             borderRadius: BorderRadius.circular(12),
             side: BorderSide(color: colors.outlineVariant),
           ),
           child: Padding(
-            padding: EdgeInsets.all(isCompact ? 10 : 16),
+            padding: const EdgeInsets.all(16),
             child: Column(
               children: [
                 ListTile(
-                  dense: isCompact,
-                  visualDensity: isCompact ? VisualDensity.compact : null,
                   contentPadding: EdgeInsets.zero,
                   leading: Icon(Icons.calendar_month, color: colors.cyberCyan),
                   title: Text('Date',
                       style: TextStyle(
                           color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          fontSize: isCompact ? 12 : 13)),
+                          fontSize: 13)),
                   subtitle: Text(
                     '${_scheduledDate.month}/${_scheduledDate.day}/${_scheduledDate.year}',
                     style: TextStyle(
                       color: Theme.of(context).colorScheme.onSurface,
                       fontWeight: FontWeight.bold,
-                      fontSize: isCompact ? 14 : 16,
+                      fontSize: 16,
                     ),
                   ),
                   trailing: TextButton(
@@ -1236,16 +1125,11 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
                     ),
                   ),
                 ),
-                Divider(
+                Divider(color: colors.outlineVariant),
-                  color: colors.outlineVariant,
-                  height: isCompact ? 8 : 16,
-                ),
                 Row(
                   children: [
                     Expanded(
                       child: ListTile(
-                        dense: isCompact,
-                        visualDensity: isCompact ? VisualDensity.compact : null,
                         contentPadding: EdgeInsets.zero,
                         title: Text('Meetup Arrival',
                             style: TextStyle(
@@ -1273,8 +1157,6 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
                     ),
                     Expanded(
                       child: ListTile(
-                        dense: isCompact,
-                        visualDensity: isCompact ? VisualDensity.compact : null,
                         contentPadding: EdgeInsets.zero,
                         title: Text('Kickstands Up (KSU)',
                             style: TextStyle(
@@ -1310,16 +1192,12 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
     );
   }
 
-  Widget _buildMeetingPointSection(
+  Widget _buildMeetingPointSection(MotorSignalThemeColors colors) {
-    MotorSignalThemeColors colors, {
-    bool isCompact = false,
-  }) {
-    final fieldGap = isCompact ? 8.0 : 12.0;
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         _buildSectionHeader('3. MEETING LOCATION', colors),
-        SizedBox(height: isCompact ? 6 : 10),
+        const SizedBox(height: 10),
         AddressAutocompleteField(
           labelText: 'Meeting Place Address / Location *',
           hintText: 'Search meetup address or landmark...',
@@ -1335,16 +1213,14 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
             _triggerRouteCalculation();
           },
         ),
-        SizedBox(height: fieldGap),
+        const SizedBox(height: 12),
         TextFormField(
           controller: _meetupNameController,
-          scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
           style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
           decoration: _inputDecoration(
             'Meeting Place Name',
             'e.g. Dahlonega Square / Shell Station',
             colors,
-            isCompact: isCompact,
           ),
           validator: (v) {
             if (v == null || v.trim().isEmpty) {
@@ -1353,38 +1229,30 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
             return null;
           },
         ),
-        SizedBox(height: fieldGap),
+        const SizedBox(height: 12),
         TextFormField(
           controller: _meetupNotesController,
-          scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
           style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
           decoration: _inputDecoration(
             'Meeting Notes (optional)',
             'e.g. Park on the north side near pumps',
             colors,
-            isCompact: isCompact,
           ),
         ),
       ],
     );
   }
 
-  Widget _buildDestinationAndStopsSection(
+  Widget _buildDestinationAndStopsSection(MotorSignalThemeColors colors) {
-    MotorSignalThemeColors colors, {
-    bool isCompact = false,
-  }) {
     final canAdd = _canAddStop;
     final totalStops = _totalPlannedStops;
-    final fieldGap = isCompact ? 8.0 : 12.0;
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         _buildSectionHeader('4. DESTINATION & STOPS', colors),
-        SizedBox(height: isCompact ? 4 : 10),
+        const SizedBox(height: 10),
         SwitchListTile(
-          dense: isCompact,
-          visualDensity: isCompact ? VisualDensity.compact : null,
           contentPadding: EdgeInsets.zero,
           activeThumbColor: colors.cyberCyan,
           title: Text('Specific Destination',
@@ -1398,7 +1266,7 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
           },
         ),
         if (_hasDestination) ...[
-          SizedBox(height: isCompact ? 4 : 8),
+          const SizedBox(height: 8),
           AddressAutocompleteField(
             labelText: 'Destination Address / Location *',
             hintText: 'Search destination address or scenic peak...',
@@ -1414,24 +1282,22 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
               _triggerRouteCalculation();
             },
           ),
-          SizedBox(height: fieldGap),
+          const SizedBox(height: 12),
           TextFormField(
             controller: _destNameController,
-            scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
             style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
             decoration: _inputDecoration(
               'Destination Name',
               'e.g. Brasstown Bald Summit',
               colors,
-              isCompact: isCompact,
             ),
           ),
         ],
-        SizedBox(height: isCompact ? 10 : 16),
+        const SizedBox(height: 16),
         // USE EXISTING ROUTE Card
         Container(
-          margin: EdgeInsets.only(bottom: isCompact ? 8 : 12),
+          margin: const EdgeInsets.only(bottom: 12),
-          padding: EdgeInsets.all(isCompact ? 10 : 12),
+          padding: const EdgeInsets.all(12),
           decoration: BoxDecoration(
             color: colors.surfaceContainerHigh,
             borderRadius: BorderRadius.circular(10),
@@ -1483,27 +1349,21 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
                   },
                 )
               else
-                Flexible(
+                ElevatedButton.icon(
-                  child: ElevatedButton.icon(
+                  onPressed: () => _showSelectRouteSheet(colors),
-                    onPressed: () => _showSelectRouteSheet(colors),
+                  icon: const Icon(Icons.alt_route, size: 14),
-                    icon: const Icon(Icons.alt_route, size: 14),
+                  label: const Text('USE EXISTING ROUTE'),
-                    label: const Text(
+                  style: ElevatedButton.styleFrom(
-                      'USE EXISTING ROUTE',
+                    backgroundColor: colors.cyberCyan.withValues(alpha: 0.15),
-                      overflow: TextOverflow.ellipsis,
+                    foregroundColor: colors.cyberCyan,
-                      maxLines: 1,
+                    side: BorderSide(color: colors.cyberCyan),
-                    ),
+                    padding:
-                    style: ElevatedButton.styleFrom(
+                        const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
-                      backgroundColor: colors.cyberCyan.withValues(alpha: 0.15),
+                    minimumSize: Size.zero,
-                      foregroundColor: colors.cyberCyan,
+                    tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                      side: BorderSide(color: colors.cyberCyan),
+                    textStyle: const TextStyle(
-                      padding: const EdgeInsets.symmetric(
+                      fontSize: 11,
-                          horizontal: 10, vertical: 6),
+                      fontWeight: FontWeight.bold,
-                      minimumSize: Size.zero,
-                      tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                      textStyle: const TextStyle(
-                        fontSize: 11,
-                        fontWeight: FontWeight.bold,
-                      ),
                     ),
                   ),
                 ),
@@ -1577,7 +1437,6 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
               for (int i = 0; i < _stops.length; i++)
                 ListTile(
                   key: ValueKey('stop_$i'),
-                  dense: isCompact,
                   tileColor: colors.surfaceContainerHigh,
                   onTap: () => _addStopDialog(colors, i),
                   leading: CircleAvatar(
@@ -1716,9 +1575,7 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
         _destinationPlace?.latLng ??
         const AppLatLng(34.5378, -83.9849);
 
-    final mapHeight = snapshot.isShortViewport
+    final mapHeight = snapshot.isLandscape ? 170.0 : 210.0;
-        ? 130.0
-        : (snapshot.isLandscape ? 160.0 : 210.0);
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -1745,7 +1602,7 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
               ),
           ],
         ),
-        SizedBox(height: snapshot.isShortViewport ? 6 : 10),
+        const SizedBox(height: 10),
         ClipRRect(
           borderRadius: BorderRadius.circular(12),
           child: Container(
@@ -1861,80 +1718,54 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
     );
   }
 
-  Widget _buildPrivacySection(
+  Widget _buildPrivacySection(MotorSignalThemeColors colors) {
-    MotorSignalThemeColors colors, {
-    bool isCompact = false,
-  }) {
     final theme = Theme.of(context);
     final onSurface = theme.colorScheme.onSurface;
-    final fieldGap = isCompact ? 8.0 : 12.0;
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         _buildSectionHeader('5. PRIVACY & PARTICIPATION', colors),
-        SizedBox(height: isCompact ? 6 : 10),
+        const SizedBox(height: 10),
         DropdownButtonFormField<GroupRideVisibility>(
           initialValue: _visibility,
-          isExpanded: true,
           dropdownColor: colors.surfaceContainerHigh,
           style: TextStyle(color: onSurface),
-          decoration: _inputDecoration(
+          decoration: _inputDecoration('Visibility', '', colors),
-            'Visibility',
-            '',
-            colors,
-            isCompact: isCompact,
-          ),
           items: GroupRideVisibility.values.map((v) {
             return DropdownMenuItem(
               value: v,
-              child: Text(
+              child: Text(v.label, style: TextStyle(color: onSurface)),
-                v.label,
-                style: TextStyle(color: onSurface),
-                overflow: TextOverflow.ellipsis,
-              ),
             );
           }).toList(),
           onChanged: (val) {
             if (val != null) setState(() => _visibility = val);
           },
         ),
-        SizedBox(height: fieldGap),
+        const SizedBox(height: 12),
         DropdownButtonFormField<GroupRideJoinPolicy>(
           initialValue: _joinPolicy,
-          isExpanded: true,
           dropdownColor: colors.surfaceContainerHigh,
           style: TextStyle(color: onSurface),
-          decoration: _inputDecoration(
+          decoration: _inputDecoration('Join Policy', '', colors),
-            'Join Policy',
-            '',
-            colors,
-            isCompact: isCompact,
-          ),
           items: GroupRideJoinPolicy.values.map((p) {
             return DropdownMenuItem(
               value: p,
-              child: Text(
+              child: Text(p.label, style: TextStyle(color: onSurface)),
-                p.label,
-                style: TextStyle(color: onSurface),
-                overflow: TextOverflow.ellipsis,
-              ),
             );
           }).toList(),
           onChanged: (val) {
             if (val != null) setState(() => _joinPolicy = val);
           },
         ),
-        SizedBox(height: fieldGap),
+        const SizedBox(height: 12),
         TextFormField(
           keyboardType: TextInputType.number,
-          scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
           style: TextStyle(color: onSurface),
           decoration: _inputDecoration(
             'Participant Limit (optional)',
             'Leave blank for no limit (min 2)',
             colors,
-            isCompact: isCompact,
           ),
           onChanged: (val) {
             final parsed = int.tryParse(val.trim());
@@ -1995,16 +1826,11 @@ class _CreateGroupRideScreenState extends ConsumerState<CreateGroupRideScreen> {
   InputDecoration _inputDecoration(
     String label,
     String hint,
-    MotorSignalThemeColors colors, {
+    MotorSignalThemeColors colors,
-    bool isCompact = false,
+  ) {
-  }) {
     final theme = Theme.of(context);
     final onSurfaceVariant = theme.colorScheme.onSurfaceVariant;
     return InputDecoration(
-      isDense: isCompact,
-      contentPadding: isCompact
-          ? const EdgeInsets.symmetric(horizontal: 12, vertical: 10)
-          : null,
       labelText: label,
       hintText: hint.isNotEmpty ? hint : null,
       labelStyle: TextStyle(color: onSurfaceVariant, fontSize: 13),

lib/features/group_rides/group_ride_detail_screen.dart

@@ -1439,7 +1439,6 @@ class _GroupRideDetailScreenState extends ConsumerState<GroupRideDetailScreen> {
 
     showModalBottomSheet(
       context: context,
-      isScrollControlled: true,
       backgroundColor: colors.surfaceContainerHigh,
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
@@ -1448,180 +1447,156 @@ class _GroupRideDetailScreenState extends ConsumerState<GroupRideDetailScreen> {
         return Consumer(
           builder: (context, ref, _) {
             final routesAsync = ref.watch(userRoutesProvider(user.uid));
-            final screenSize = MediaQuery.sizeOf(sheetCtx);
-            final viewInsets = MediaQuery.viewInsetsOf(sheetCtx);
-            final isCompact = screenSize.height < 480 || viewInsets.bottom > 0;
-            final availableHeight = (screenSize.height - viewInsets.bottom)
-                .clamp(120.0, screenSize.height);
             return SafeArea(
               child: Padding(
-                padding: EdgeInsets.only(bottom: viewInsets.bottom),
+                padding: const EdgeInsets.all(16),
-                child: ConstrainedBox(
+                child: Column(
-                  constraints: BoxConstraints(
+                  mainAxisSize: MainAxisSize.min,
-                    maxHeight: availableHeight * 0.9,
+                  crossAxisAlignment: CrossAxisAlignment.start,
-                    maxWidth: 560,
+                  children: [
-                  ),
+                    Text(
-                  child: SingleChildScrollView(
+                      'ATTACH SAVED ROUTE',
-                    padding: EdgeInsets.symmetric(
+                      style: TextStyle(
-                      horizontal: 16,
+                        color: Theme.of(context).colorScheme.onSurface,
-                      vertical: isCompact ? 10 : 16,
+                        fontWeight: FontWeight.bold,
+                        fontSize: 16,
+                      ),
                     ),
-                    child: Column(
+                    const SizedBox(height: 12),
-                      mainAxisSize: MainAxisSize.min,
+                    routesAsync.when(
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                      loading: () => Center(
-                      children: [
+                        child: Padding(
-                        Text(
+                          padding: const EdgeInsets.all(24),
-                          'ATTACH SAVED ROUTE',
+                          child:
-                          style: TextStyle(
+                              CircularProgressIndicator(color: colors.cyberCyan),
-                            color: Theme.of(context).colorScheme.onSurface,
-                            fontWeight: FontWeight.bold,
-                            fontSize: 16,
-                          ),
                         ),
-                        SizedBox(height: isCompact ? 8 : 12),
+                      ),
-                        routesAsync.when(
+                      error: (err, _) => Text(
-                          loading: () => Center(
+                        'Failed to load routes: $err',
-                            child: Padding(
+                        style: TextStyle(color: colors.raceRed),
-                              padding: EdgeInsets.all(isCompact ? 12 : 24),
+                      ),
-                              child: CircularProgressIndicator(
+                      data: (routes) {
-                                color: colors.cyberCyan,
+                        if (routes.isEmpty) {
-                              ),
+                          return Padding(
-                            ),
+                            padding: const EdgeInsets.symmetric(vertical: 24),
-                          ),
+                            child: Center(
-                          error: (err, _) => Text(
+                              child: Column(
-                            'Failed to load routes: $err',
+                                children: [
-                            style: TextStyle(color: colors.raceRed),
+                                  Text(
-                          ),
+                                    'You have no saved routes yet.',
-                          data: (routes) {
+                                    style: TextStyle(
-                            if (routes.isEmpty) {
-                              return Padding(
-                                padding: EdgeInsets.symmetric(
-                                  vertical: isCompact ? 8 : 24,
-                                ),
-                                child: Center(
-                                  child: Column(
-                                    mainAxisSize: MainAxisSize.min,
-                                    children: [
-                                      Text(
-                                        'You have no saved routes yet.',
-                                        style: TextStyle(
-                                          color: Theme.of(context)
-                                              .colorScheme
-                                              .onSurfaceVariant,
-                                        ),
-                                      ),
-                                      SizedBox(height: isCompact ? 8 : 12),
-                                      ElevatedButton(
-                                        onPressed: () {
-                                          Navigator.pop(sheetCtx);
-                                          context.push(
-                                            '/routes/planner?groupRideId=${ride.id}',
-                                          );
-                                        },
-                                        style: ElevatedButton.styleFrom(
-                                          backgroundColor: colors.cyberCyan,
-                                          foregroundColor: colors.onBrand,
-                                        ),
-                                        child: const Text('CREATE A ROUTE'),
-                                      ),
-                                    ],
-                                  ),
-                                ),
-                              );
-                            }
-                            return ConstrainedBox(
-                              constraints: BoxConstraints(
-                                maxHeight: availableHeight * 0.55,
-                              ),
-                              child: ListView.builder(
-                                shrinkWrap: true,
-                                itemCount: routes.length,
-                                itemBuilder: (ctx, idx) {
-                                  final route = routes[idx];
-                                  return ListTile(
-                                    dense: isCompact,
-                                    leading: Icon(
-                                      Icons.alt_route,
-                                      color: colors.cyberCyan,
-                                    ),
-                                    title: Text(
-                                      route.title,
-                                      style: TextStyle(
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .onSurface,
-                                        fontWeight: FontWeight.bold,
-                                      ),
-                                    ),
-                                    subtitle: Text(
-                                      '${route.stops.length} stops • ${route.formattedDistanceMiles}',
-                                      style: TextStyle(
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .onSurfaceVariant,
-                                        fontSize: 12,
-                                      ),
-                                    ),
-                                    trailing: Icon(
-                                      Icons.chevron_right,
                                       color: Theme.of(context)
                                           .colorScheme
-                                          .onSurfaceVariant
+                                          .onSurfaceVariant,
-                                          .withValues(alpha: 0.4),
                                     ),
-                                    onTap: () async {
+                                  ),
+                                  const SizedBox(height: 12),
+                                  ElevatedButton(
+                                    onPressed: () {
                                       Navigator.pop(sheetCtx);
-                                      try {
+                                      context.push(
-                                        final user =
+                                        '/routes/planner?groupRideId=${ride.id}',
-                                            ref.read(currentUserProvider);
+                                      );
-                                        if (user == null || user.uid.isEmpty) {
-                                          throw StateError(
-                                            'Sign-in required to attach route.',
-                                          );
-                                        }
-                                        await ref
-                                            .read(routeServiceProvider)
-                                            .attachRouteToGroupRide(
-                                              groupRideId: ride.id,
-                                              route: route,
-                                              callerUid: user.uid,
-                                            );
-                                        if (context.mounted) {
-                                          ScaffoldMessenger.of(
-                                            context,
-                                          ).showSnackBar(
-                                            SnackBar(
-                                              content: Text(
-                                                'Attached "${route.title}" to group ride.',
-                                              ),
-                                              backgroundColor:
-                                                  colors.launchGreen,
-                                            ),
-                                          );
-                                        }
-                                      } catch (e) {
-                                        if (context.mounted) {
-                                          ScaffoldMessenger.of(
-                                            context,
-                                          ).showSnackBar(
-                                            SnackBar(
-                                              content: Text(
-                                                'Failed to attach route: $e',
-                                              ),
-                                            ),
-                                          );
-                                        }
-                                      }
                                     },
-                                  );
+                                    style: ElevatedButton.styleFrom(
-                                },
+                                      backgroundColor: colors.cyberCyan,
+                                      foregroundColor: colors.onBrand,
+                                    ),
+                                    child: const Text('CREATE A ROUTE'),
+                                  ),
+                                ],
                               ),
-                            );
+                            ),
-                          },
+                          );
-                        ),
+                        }
-                      ],
+                        return ConstrainedBox(
+                          constraints: BoxConstraints(
+                            maxHeight: MediaQuery.of(context).size.height * 0.4,
+                          ),
+                          child: ListView.builder(
+                            shrinkWrap: true,
+                            itemCount: routes.length,
+                            itemBuilder: (ctx, idx) {
+                              final route = routes[idx];
+                              return ListTile(
+                                leading: Icon(
+                                  Icons.alt_route,
+                                  color: colors.cyberCyan,
+                                ),
+                                title: Text(
+                                  route.title,
+                                  style: TextStyle(
+                                    color: Theme.of(context)
+                                        .colorScheme
+                                        .onSurface,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                                subtitle: Text(
+                                  '${route.stops.length} stops • ${route.formattedDistanceMiles}',
+                                  style: TextStyle(
+                                    color: Theme.of(context)
+                                        .colorScheme
+                                        .onSurfaceVariant,
+                                    fontSize: 12,
+                                  ),
+                                ),
+                                trailing: Icon(
+                                  Icons.chevron_right,
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onSurfaceVariant
+                                      .withValues(alpha: 0.4),
+                                ),
+                                onTap: () async {
+                                  Navigator.pop(sheetCtx);
+                                  try {
+                                    final user = ref.read(currentUserProvider);
+                                    if (user == null || user.uid.isEmpty) {
+                                      throw StateError(
+                                          'Sign-in required to attach route.');
+                                    }
+                                    await ref
+                                        .read(routeServiceProvider)
+                                        .attachRouteToGroupRide(
+                                          groupRideId: ride.id,
+                                          route: route,
+                                          callerUid: user.uid,
+                                        );
+                                    if (context.mounted) {
+                                      ScaffoldMessenger.of(
+                                        context,
+                                      ).showSnackBar(
+                                        SnackBar(
+                                          content: Text(
+                                            'Attached "${route.title}" to group ride.',
+                                          ),
+                                          backgroundColor:
+                                              colors.launchGreen,
+                                        ),
+                                      );
+                                    }
+                                  } catch (e) {
+                                    if (context.mounted) {
+                                      ScaffoldMessenger.of(
+                                        context,
+                                      ).showSnackBar(
+                                        SnackBar(
+                                          content: Text(
+                                            'Failed to attach route: $e',
+                                          ),
+                                        ),
+                                      );
+                                    }
+                                  }
+                                },
+                              );
+                            },
+                          ),
+                        );
+                      },
                     ),
-                  ),
+                  ],
                 ),
               ),
             );

lib/features/group_rides/group_rides_hub_screen.dart

@@ -115,17 +115,9 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
           if (!isAuthed) {
             return _buildAccountRequiredNotice(context, colors);
           }
-          final showBanner = snapshot.height >= 160;
           return Column(
             children: [
-              if (showBanner)
+              _buildMemberProfileBanner(context, ref, user, colors),
-                _buildMemberProfileBanner(
-                  context,
-                  ref,
-                  user,
-                  colors,
-                  isCompact: snapshot.isShortViewport,
-                ),
               Expanded(
                 child: TabBarView(
                   controller: _tabController,
@@ -159,9 +151,8 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
     BuildContext context,
     WidgetRef ref,
     AuthUser user,
-    MotorSignalThemeColors colors, {
+    MotorSignalThemeColors colors,
-    bool isCompact = false,
+  ) {
-  }) {
     final profileAsync = ref.watch(myRiderProfileProvider);
     final isPro = ref.watch(isProSubscriberProvider);
     final profile = profileAsync.valueOrNull;
@@ -186,10 +177,7 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
           bottom: BorderSide(color: colors.surfaceBorder, width: 1.0),
         ),
       ),
-      padding: EdgeInsets.symmetric(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
-        horizontal: 16.0,
-        vertical: isCompact ? 8.0 : 12.0,
-      ),
       child: Column(
         children: [
           Row(
@@ -427,18 +415,12 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
               crossAxisCount: crossAxisCount,
               crossAxisSpacing: 16,
               mainAxisSpacing: 16,
-              mainAxisExtent: 300,
+              mainAxisExtent: 260,
             ),
             itemCount: rides.length,
             itemBuilder: (context, index) {
               final ride = rides[index];
-              return _buildRideCard(
+              return _buildRideCard(context, ride, currentUid, colors);
-                context,
-                ride,
-                currentUid,
-                colors,
-                inGrid: true,
-              );
             },
           );
         }
@@ -497,18 +479,12 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
               crossAxisCount: crossAxisCount,
               crossAxisSpacing: 16,
               mainAxisSpacing: 16,
-              mainAxisExtent: 300,
+              mainAxisExtent: 260,
             ),
             itemCount: myRides.length,
             itemBuilder: (context, index) {
               final ride = myRides[index];
-              return _buildRideCard(
+              return _buildRideCard(context, ride, currentUid, colors);
-                context,
-                ride,
-                currentUid,
-                colors,
-                inGrid: true,
-              );
             },
           );
         }
@@ -587,10 +563,9 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
   }) {
     final theme = Theme.of(context);
     return Center(
-      child: SingleChildScrollView(
+      child: Padding(
-        padding: const EdgeInsets.all(24.0),
+        padding: const EdgeInsets.all(32.0),
         child: Column(
-          mainAxisSize: MainAxisSize.min,
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
             Icon(
@@ -663,113 +638,61 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
     final controller = TextEditingController();
     showDialog(
       context: context,
-      builder: (dialogCtx) {
+      builder: (dialogCtx) => AlertDialog(
-        final size = MediaQuery.sizeOf(dialogCtx);
+        backgroundColor: colors.surfaceContainerHigh,
-        final viewInsets = MediaQuery.viewInsetsOf(dialogCtx);
+        title: Row(
-        final availableHeight = size.height - viewInsets.bottom;
+          children: [
-        final isCompactVertical = availableHeight < 280;
+            Icon(Icons.group_add, color: colors.cyberCyan, size: 24),
-
+            const SizedBox(width: 10),
-        return AlertDialog(
+            const Text(
-          scrollable: true,
+              'Join Group Ride',
-          backgroundColor: colors.surfaceContainerHigh,
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
-          insetPadding: EdgeInsets.symmetric(
-            horizontal: 24,
-            vertical: isCompactVertical ? 8 : 24,
-          ),
-          titlePadding: EdgeInsets.fromLTRB(
-            20,
-            isCompactVertical ? 12 : 20,
-            20,
-            isCompactVertical ? 6 : 12,
-          ),
-          contentPadding: EdgeInsets.fromLTRB(
-            20,
-            0,
-            20,
-            isCompactVertical ? 8 : 16,
-          ),
-          actionsPadding: EdgeInsets.fromLTRB(
-            16,
-            0,
-            16,
-            isCompactVertical ? 8 : 14,
-          ),
-          title: Row(
-            children: [
-              Icon(
-                Icons.group_add,
-                color: colors.cyberCyan,
-                size: isCompactVertical ? 20 : 24,
-              ),
-              const SizedBox(width: 10),
-              Flexible(
-                child: Text(
-                  'Join Group Ride',
-                  style: TextStyle(
-                    fontSize: isCompactVertical ? 16 : 18,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            ],
-          ),
-          content: ConstrainedBox(
-            constraints: const BoxConstraints(maxWidth: 420),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const Text(
-                  'Enter the Ride ID or shared link:',
-                  style: TextStyle(fontSize: 13),
-                ),
-                SizedBox(height: isCompactVertical ? 8 : 12),
-                TextField(
-                  key: const ValueKey('join_ride_id_field'),
-                  controller: controller,
-                  autofocus: true,
-                  scrollPadding: const EdgeInsets.fromLTRB(20, 20, 20, 80),
-                  decoration: InputDecoration(
-                    hintText: 'e.g. ride_1790320722076_4btn4W',
-                    isDense: isCompactVertical,
-                    border: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(8),
-                    ),
-                    contentPadding: EdgeInsets.symmetric(
-                      horizontal: 12,
-                      vertical: isCompactVertical ? 8 : 10,
-                    ),
-                  ),
-                ),
-              ],
             ),
-          ),
+          ],
-          actions: [
+        ),
-            TextButton(
+        content: Column(
-              onPressed: () => Navigator.of(dialogCtx).pop(),
+          mainAxisSize: MainAxisSize.min,
-              child: const Text('CANCEL'),
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const Text(
+              'Enter the Ride ID or shared link:',
+              style: TextStyle(fontSize: 13),
             ),
-            ElevatedButton(
+            const SizedBox(height: 12),
-              key: const ValueKey('join_ride_dialog_submit_button'),
+            TextField(
-              style: ElevatedButton.styleFrom(
+              key: const ValueKey('join_ride_id_field'),
-                backgroundColor: colors.cyberCyan,
+              controller: controller,
-                foregroundColor: colors.onBrand,
+              autofocus: true,
-              ),
+              decoration: InputDecoration(
-              onPressed: () {
+                hintText: 'e.g. ride_1790320722076_4btn4W',
-                final raw = controller.text.trim();
+                border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
-                if (raw.isEmpty) return;
+                contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
-                final rideId = raw.contains('/') ? raw.split('/').last : raw;
-                Navigator.of(dialogCtx).pop();
-                context.push('/group-rides/$rideId');
-              },
-              child: const Text(
-                'VIEW RIDE',
-                style: TextStyle(fontWeight: FontWeight.bold),
               ),
             ),
           ],
-        );
+        ),
-      },
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(dialogCtx).pop(),
+            child: const Text('CANCEL'),
+          ),
+          ElevatedButton(
+            key: const ValueKey('join_ride_dialog_submit_button'),
+            style: ElevatedButton.styleFrom(
+              backgroundColor: colors.cyberCyan,
+              foregroundColor: colors.onBrand,
+            ),
+            onPressed: () {
+              final raw = controller.text.trim();
+              if (raw.isEmpty) return;
+              final rideId = raw.contains('/') ? raw.split('/').last : raw;
+              Navigator.of(dialogCtx).pop();
+              context.push('/group-rides/$rideId');
+            },
+            child: const Text('VIEW RIDE', style: TextStyle(fontWeight: FontWeight.bold)),
+          ),
+        ],
+      ),
     );
   }
 
@@ -777,14 +700,13 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
     BuildContext context,
     GroupRide ride,
     String currentUid,
-    MotorSignalThemeColors colors, {
+    MotorSignalThemeColors colors,
-    bool inGrid = false,
+  ) {
-  }) {
     final isOrganizer = ride.organizerUid == currentUid;
     final isParticipant = ride.accessUids.contains(currentUid);
 
     return Card(
-      margin: inGrid ? EdgeInsets.zero : const EdgeInsets.only(bottom: 12),
+      margin: const EdgeInsets.only(bottom: 12),
       color: colors.surfaceCardPrimary,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(12),
@@ -1002,12 +924,9 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
                             ),
                           ),
                           onPressed: () => context.push('/group-rides/${ride.id}'),
-                          child: const FittedBox(
+                          child: const Text(
-                            fit: BoxFit.scaleDown,
+                            'MANAGE RIDE',
-                            child: Text(
+                            style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                              'MANAGE RIDE',
-                              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                            ),
                           ),
                         ),
                       ),
@@ -1026,12 +945,9 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
                             ),
                           ),
                           onPressed: () => context.push('/group-rides/${ride.id}'),
-                          child: const FittedBox(
+                          child: const Text(
-                            fit: BoxFit.scaleDown,
+                            'OPEN HUB',
-                            child: Text(
+                            style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                              'OPEN HUB',
-                              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                            ),
                           ),
                         ),
                       ),
@@ -1055,12 +971,9 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
                             ),
                           ),
                           onPressed: () => context.push('/group-rides/${ride.id}'),
-                          child: const FittedBox(
+                          child: const Text(
-                            fit: BoxFit.scaleDown,
+                            'RIDE DETAILS',
-                            child: Text(
+                            style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                              'RIDE DETAILS',
-                              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                            ),
                           ),
                         ),
                       ),
@@ -1081,12 +994,9 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
                             ),
                           ),
                           onPressed: () => context.push('/group-rides/${ride.id}'),
-                          child: const FittedBox(
+                          child: const Text(
-                            fit: BoxFit.scaleDown,
+                            'LEAVE PACK',
-                            child: Text(
+                            style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                              'LEAVE PACK',
-                              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                            ),
                           ),
                         ),
                       ),
@@ -1109,12 +1019,9 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
                             ),
                           ),
                           onPressed: () => context.push('/group-rides/${ride.id}'),
-                          child: const FittedBox(
+                          child: const Text(
-                            fit: BoxFit.scaleDown,
+                            'RIDE DETAILS',
-                            child: Text(
+                            style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                              'RIDE DETAILS',
-                              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                            ),
                           ),
                         ),
                       ),
@@ -1133,12 +1040,9 @@ class _GroupRidesHubScreenState extends ConsumerState<GroupRidesHubScreen>
                             ),
                           ),
                           onPressed: () => context.push('/group-rides/${ride.id}'),
-                          child: const FittedBox(
+                          child: const Text(
-                            fit: BoxFit.scaleDown,
+                            'JOIN RIDE',
-                            child: Text(
+                            style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                              'JOIN RIDE',
-                              style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
-                            ),
                           ),
                         ),
                       ),

lib/features/group_rides/live_group_ride_screen.dart

@@ -295,10 +295,10 @@ class _LiveGroupRideScreenState extends ConsumerState<LiveGroupRideScreen>
                   body: ResponsiveLayout(
                     builder: (context, snapshot) {
                       final isShort = snapshot.height < 450;
-                      final isLandscape =
+                      final isLandscapeWide =
-                          snapshot.isLandscape && snapshot.width >= 560;
+                          snapshot.isLandscape && snapshot.width >= 720;
 
-                      Widget buildMapStack({required bool inLandscape}) => Stack(
+                      final mapStack = Stack(
                         children: [
                           // 1. Unified Map
                           Positioned.fill(
@@ -336,7 +336,7 @@ class _LiveGroupRideScreenState extends ConsumerState<LiveGroupRideScreen>
 
                           // 5. Map HUD Bottom: Map Mode Selector & Regroup Point
                           Positioned(
-                            bottom: inLandscape ? (isShort ? 94 : 108) : 8,
+                            bottom: 8,
                             left: 8,
                             right: 8,
                             child: FittedBox(
@@ -360,7 +360,7 @@ class _LiveGroupRideScreenState extends ConsumerState<LiveGroupRideScreen>
                           Positioned(
                             top: 54,
                             left: 8,
-                            right: inLandscape ? snapshot.width * 0.35 : 8,
+                            right: isLandscapeWide ? snapshot.width * 0.35 : 8,
                             child: Column(
                               mainAxisSize: MainAxisSize.min,
                               children: [
@@ -386,17 +386,15 @@ class _LiveGroupRideScreenState extends ConsumerState<LiveGroupRideScreen>
                         ],
                       );
 
-                      if (isLandscape) {
+                      if (isLandscapeWide) {
-                        final leftFlex = snapshot.width >= 720 ? 65 : 60;
-                        final rightFlex = 100 - leftFlex;
                         return Row(
                           children: [
                             // Left: Tactical Map Canvas
                             Expanded(
-                              flex: leftFlex,
+                              flex: 65,
                               child: Stack(
                                 children: [
-                                  buildMapStack(inLandscape: true),
+                                  mapStack,
                                   Positioned(
                                     bottom: isShort ? 6 : 10,
                                     left: 8,
@@ -437,7 +435,7 @@ class _LiveGroupRideScreenState extends ConsumerState<LiveGroupRideScreen>
                             ),
                             // Right: Pack Telemetry Stream & Formation Safety Metrics
                             Expanded(
-                              flex: rightFlex,
+                              flex: 35,
                               child: Container(
                                 decoration: BoxDecoration(
                                   color: colors.surfaceContainer,
@@ -479,7 +477,7 @@ class _LiveGroupRideScreenState extends ConsumerState<LiveGroupRideScreen>
                           // Top Section: Map Canvas with HUDs
                           Expanded(
                             flex: 52,
-                            child: buildMapStack(inLandscape: false),
+                            child: mapStack,
                           ),
 
                           // Cockpit Navigation Tab Bar
@@ -1021,7 +1019,7 @@ class _LiveGroupRideScreenState extends ConsumerState<LiveGroupRideScreen>
     ];
 
     return Container(
-      height: isShort ? 38 : 46,
+      height: isShort ? 40 : 46,
       decoration: BoxDecoration(
         color: colors.surfaceContainerHigh.withValues(alpha: 0.95),
         borderRadius: BorderRadius.circular(10),
@@ -1030,84 +1028,71 @@ class _LiveGroupRideScreenState extends ConsumerState<LiveGroupRideScreen>
           BoxShadow(color: Colors.black54, blurRadius: 6, offset: Offset(0, 2)),
         ],
       ),
-      child: LayoutBuilder(
+      child: SingleChildScrollView(
-        builder: (context, constraints) {
+        scrollDirection: Axis.horizontal,
-          final statusItems = Row(
+        padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4),
-            mainAxisSize: MainAxisSize.min,
+        child: Row(
-            children: [
+          mainAxisSize: MainAxisSize.min,
-              for (int index = 0; index < statuses.length; index++) ...[
+          children: [
-                if (index > 0) const SizedBox(width: 4),
+            for (int index = 0; index < statuses.length; index++) ...[
-                () {
+              if (index > 0) const SizedBox(width: 6),
-                  final (status, label, icon) = statuses[index];
+              () {
-                  final isSelected = currentStatus == status;
+                final (status, label, icon) = statuses[index];
+                final isSelected = currentStatus == status;
 
-                  Color activeColor = colors.cyberCyan;
+                Color activeColor = colors.cyberCyan;
-                  if (status == LivePresenceStatus.needFuel) {
+                if (status == LivePresenceStatus.needFuel) {
-                    activeColor = Colors.orangeAccent;
+                  activeColor = Colors.orangeAccent;
-                  }
+                }
-                  if (status == LivePresenceStatus.regrouping) {
+                if (status == LivePresenceStatus.regrouping) {
-                    activeColor = colors.warningAmber;
+                  activeColor = colors.warningAmber;
-                  }
+                }
-                  if (status == LivePresenceStatus.arrived) {
+                if (status == LivePresenceStatus.arrived) {
-                    activeColor = colors.launchGreen;
+                  activeColor = colors.launchGreen;
-                  }
+                }
 
-                  return InkWell(
+                return InkWell(
-                    borderRadius: BorderRadius.circular(6),
+                  borderRadius: BorderRadius.circular(6),
-                    onTap: () => onStatusSelected(status),
+                  onTap: () => onStatusSelected(status),
-                    child: Container(
+                  child: Container(
-                      padding: EdgeInsets.symmetric(
+                    padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
-                        horizontal: isShort ? 6 : 8,
+                    decoration: BoxDecoration(
-                        vertical: isShort ? 3 : 4,
+                      color: isSelected
-                      ),
+                          ? activeColor.withValues(alpha: 0.2)
-                      decoration: BoxDecoration(
+                          : Colors.transparent,
-                        color: isSelected
+                      borderRadius: BorderRadius.circular(6),
-                            ? activeColor.withValues(alpha: 0.2)
+                      border: Border.all(
-                            : Colors.transparent,
+                        color: isSelected ? activeColor : Colors.transparent,
-                        borderRadius: BorderRadius.circular(6),
+                        width: 1.2,
-                        border: Border.all(
-                          color: isSelected ? activeColor : Colors.transparent,
-                          width: 1.2,
-                        ),
-                      ),
-                      child: Row(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          Icon(
-                            icon,
-                            size: isShort ? 14 : 16,
-                            color: isSelected ? activeColor : Colors.white60,
-                          ),
-                          const SizedBox(width: 4),
-                          Text(
-                            label,
-                            style: TextStyle(
-                              color: isSelected ? activeColor : Colors.white70,
-                              fontWeight: isSelected
-                                  ? FontWeight.bold
-                                  : FontWeight.w500,
-                              fontSize: isShort ? 10 : 11,
-                            ),
-                          ),
-                        ],
                       ),
                     ),
-                  );
+                    child: Row(
-                }(),
+                      mainAxisSize: MainAxisSize.min,
-              ],
+                      children: [
+                        Icon(
+                          icon,
+                          size: 16,
+                          color: isSelected ? activeColor : Colors.white60,
+                        ),
+                        const SizedBox(width: 5),
+                        Text(
+                          label,
+                          style: TextStyle(
+                            color: isSelected ? activeColor : Colors.white70,
+                            fontWeight: isSelected
+                                ? FontWeight.bold
+                                : FontWeight.w500,
+                            fontSize: 11,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                );
+              }(),
             ],
-          );
+          ],
-
+        ),
-          return SingleChildScrollView(
-            scrollDirection: Axis.horizontal,
-            padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),
-            child: FittedBox(
-              fit: BoxFit.scaleDown,
-              alignment: Alignment.centerLeft,
-              child: statusItems,
-            ),
-          );
-        },
       ),
     );
   }
@@ -1124,190 +1109,165 @@ class _LiveGroupRideScreenState extends ConsumerState<LiveGroupRideScreen>
     required MotorSignalThemeColors colors,
     bool isShort = false,
   }) {
-    return LayoutBuilder(
+    final screenWidth = MediaQuery.of(context).size.width;
-      builder: (context, constraints) {
+    final isCompact = screenWidth < 360;
-        final availableWidth = constraints.maxWidth;
-        final isCompact = availableWidth < 420;
 
-        return Container(
+    return Container(
-          padding: EdgeInsets.symmetric(
+      padding: EdgeInsets.symmetric(
-            horizontal: isCompact ? 6 : 8,
+        horizontal: isCompact ? 6 : 8,
-            vertical: isShort ? 4 : 6,
+        vertical: isShort ? 4 : 6,
-          ),
+      ),
-          decoration: BoxDecoration(
+      decoration: BoxDecoration(
-            color: colors.surfaceContainerHigh.withValues(alpha: 0.95),
+        color: colors.surfaceContainerHigh.withValues(alpha: 0.95),
-            borderRadius: BorderRadius.circular(10),
+        borderRadius: BorderRadius.circular(10),
-            border: Border.all(color: colors.outlineVariant),
+        border: Border.all(color: colors.outlineVariant),
-            boxShadow: const [
+        boxShadow: const [
-              BoxShadow(color: Colors.black54, blurRadius: 6, offset: Offset(0, 2)),
+          BoxShadow(color: Colors.black54, blurRadius: 6, offset: Offset(0, 2)),
-            ],
+        ],
-          ),
+      ),
-          child: SingleChildScrollView(
+      child: Row(
-            scrollDirection: Axis.horizontal,
+        children: [
-            child: ConstrainedBox(
+          // Ghost mode / Broadcast switch
-              constraints: BoxConstraints(
+          Expanded(
-                minWidth: availableWidth > 16 ? availableWidth - 16 : 0,
+            child: Row(
-              ),
+              children: [
-              child: Row(
+                Icon(
-                mainAxisSize: MainAxisSize.min,
+                  broadcastState.isBroadcasting
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      ? Icons.radar
-                children: [
+                      : Icons.location_off,
-                  // Broadcast state info & switch
+                  color: broadcastState.isBroadcasting
-                  Row(
+                      ? colors.cyberCyan
+                      : Colors.white38,
+                  size: isCompact ? 18 : 20,
+                ),
+                SizedBox(width: isCompact ? 4 : 8),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
                     mainAxisSize: MainAxisSize.min,
                     children: [
-                      Icon(
+                      Text(
                         broadcastState.isBroadcasting
-                            ? Icons.radar
+                            ? (broadcastState.isPaused
-                            : Icons.location_off,
+                                  ? 'PAUSED'
-                        color: broadcastState.isBroadcasting
+                                  : (broadcastState.isBackground
-                            ? colors.cyberCyan
+                                        ? 'BACKGROUND'
-                            : Colors.white38,
+                                        : 'SHARING LIVE'))
-                        size: isCompact ? 16 : 20,
+                            : 'GHOST MODE',
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: TextStyle(
+                          color: broadcastState.isBroadcasting
+                              ? (broadcastState.isPaused
+                                    ? colors.warningAmber
+                                    : colors.cyberCyan)
+                              : Colors.white60,
+                          fontWeight: FontWeight.bold,
+                          fontSize: isCompact ? 10 : 11,
+                          letterSpacing: 0.5,
+                        ),
                       ),
-                      SizedBox(width: isCompact ? 4 : 8),
+                      Text(
-                      Column(
+                        broadcastState.isBroadcasting
-                        crossAxisAlignment: CrossAxisAlignment.start,
+                            ? (broadcastState.isPaused
-                        mainAxisSize: MainAxisSize.min,
+                                  ? 'Reconnecting...'
-                        children: [
+                                  : (broadcastState.isBackground
-                          Text(
+                                        ? 'Foreground active'
-                            broadcastState.isBroadcasting
+                                        : 'Broadcasting'))
-                                ? (broadcastState.isPaused
+                            : 'Location paused',
-                                      ? 'PAUSED'
+                        maxLines: 1,
-                                      : (broadcastState.isBackground
+                        overflow: TextOverflow.ellipsis,
-                                            ? 'BACKGROUND'
+                        style: TextStyle(
-                                            : 'SHARING LIVE'))
+                          color: Colors.white38,
-                                : 'GHOST MODE',
+                          fontSize: isCompact ? 9 : 10,
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                            style: TextStyle(
-                              color: broadcastState.isBroadcasting
-                                  ? (broadcastState.isPaused
-                                        ? colors.warningAmber
-                                        : colors.cyberCyan)
-                                  : Colors.white60,
-                              fontWeight: FontWeight.bold,
-                              fontSize: isCompact ? 10 : 11,
-                              letterSpacing: 0.5,
-                            ),
-                          ),
-                          if (!isShort)
-                            Text(
-                              broadcastState.isBroadcasting
-                                  ? (broadcastState.isPaused
-                                        ? 'Reconnecting...'
-                                        : (broadcastState.isBackground
-                                              ? 'Foreground active'
-                                              : 'Broadcasting'))
-                                  : 'Location paused',
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                              style: TextStyle(
-                                color: Colors.white38,
-                                fontSize: isCompact ? 8.5 : 10,
-                              ),
-                            ),
-                        ],
-                      ),
-                      SizedBox(width: isCompact ? 4 : 6),
-                      Transform.scale(
-                        scale: isCompact ? 0.8 : 1.0,
-                        child: Switch(
-                          key: const ValueKey('live_ride_broadcast_switch'),
-                          value: broadcastState.isOptedIn,
-                          materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                          activeThumbColor: colors.cyberCyan,
-                          onChanged: (val) {
-                            if (val && !broadcastState.isMasterAllowed) {
-                              ref.read(groupRideLiveSharingAllowedProvider.notifier).state = true;
-                            }
-                            broadcastController.setOptIn(val);
-                          },
                         ),
                       ),
                     ],
                   ),
-
+                ),
-                  SizedBox(width: isCompact ? 6 : 10),
+                Switch(
-
+                  key: const ValueKey('live_ride_broadcast_switch'),
-                  // Action buttons
+                  value: broadcastState.isOptedIn,
-                  Row(
+                  materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                    mainAxisSize: MainAxisSize.min,
+                  activeThumbColor: colors.cyberCyan,
-                    children: [
+                  onChanged: (val) {
-                      // Recenter Map Button
+                    if (val && !broadcastState.isMasterAllowed) {
-                      IconButton(
+                      ref.read(groupRideLiveSharingAllowedProvider.notifier).state = true;
-                        key: const ValueKey('live_ride_recenter_button'),
+                    }
-                        style: IconButton.styleFrom(
+                    broadcastController.setOptIn(val);
-                          backgroundColor: colors.surfaceContainer,
+                  },
-                          padding: EdgeInsets.all(isCompact ? 4 : 8),
+                ),
-                          minimumSize: Size(isCompact ? 36 : 44, isCompact ? 36 : 44),
+              ],
-                        ),
-                        icon: Icon(
-                          Icons.my_location,
-                          color: Colors.white70,
-                          size: isCompact ? 16 : 20,
-                        ),
-                        tooltip: 'Center on Me',
-                        onPressed: () {
-                          if (broadcastState.lastPosition != null) {
-                            setState(() {
-                              _customMapCenter = AppLatLng(
-                                broadcastState.lastPosition!.latitude,
-                                broadcastState.lastPosition!.longitude,
-                              );
-                              _mapZoom = 15.0;
-                            });
-                          } else {
-                            setState(() {
-                              _customMapCenter = AppLatLng(
-                                ride.meetingPoint.latitude,
-                                ride.meetingPoint.longitude,
-                              );
-                            });
-                          }
-                        },
-                      ),
-
-                      SizedBox(width: isCompact ? 4 : 6),
-
-                      // Roster Opener Button
-                      ElevatedButton.icon(
-                        key: const ValueKey('live_ride_roster_button'),
-                        style: ElevatedButton.styleFrom(
-                          backgroundColor: colors.cyberCyan.withValues(alpha: 0.15),
-                          foregroundColor: colors.cyberCyan,
-                          side: BorderSide(color: colors.cyberCyan),
-                          padding: EdgeInsets.symmetric(
-                            horizontal: isCompact ? 6 : 10,
-                            vertical: isCompact ? 4 : 8,
-                          ),
-                          minimumSize: Size(isCompact ? 36 : 44, isCompact ? 36 : 44),
-                        ),
-                        icon: const Icon(Icons.format_list_bulleted, size: 14),
-                        label: Text(
-                          '${participants.length}',
-                          style: TextStyle(
-                            fontSize: isCompact ? 10 : 11,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        ),
-                        onPressed: () => _showRosterSheet(
-                          context: context,
-                          participants: participants,
-                          presences: presences,
-                          leadPresence: leadPresence,
-                          currentUid: currentUid,
-                          colors: colors,
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
             ),
           ),
-        );
+
-      },
+          SizedBox(width: isCompact ? 4 : 8),
+
+          // Recenter Map Button (min 48x48 tap target)
+          IconButton(
+            key: const ValueKey('live_ride_recenter_button'),
+            style: IconButton.styleFrom(
+              backgroundColor: colors.surfaceContainer,
+              padding: EdgeInsets.all(isCompact ? 6 : 8),
+              minimumSize: Size(isCompact ? 40 : 48, isCompact ? 40 : 48),
+            ),
+            icon: Icon(
+              Icons.my_location,
+              color: Colors.white70,
+              size: isCompact ? 18 : 20,
+            ),
+            tooltip: 'Center on Me',
+            onPressed: () {
+              if (broadcastState.lastPosition != null) {
+                setState(() {
+                  _customMapCenter = AppLatLng(
+                    broadcastState.lastPosition!.latitude,
+                    broadcastState.lastPosition!.longitude,
+                  );
+                  _mapZoom = 15.0;
+                });
+              } else {
+                setState(() {
+                  _customMapCenter = AppLatLng(
+                    ride.meetingPoint.latitude,
+                    ride.meetingPoint.longitude,
+                  );
+                });
+              }
+            },
+          ),
+
+          SizedBox(width: isCompact ? 4 : 6),
+
+          // Roster Opener Button
+          ElevatedButton.icon(
+            key: const ValueKey('live_ride_roster_button'),
+            style: ElevatedButton.styleFrom(
+              backgroundColor: colors.cyberCyan.withValues(alpha: 0.15),
+              foregroundColor: colors.cyberCyan,
+              side: BorderSide(color: colors.cyberCyan),
+              padding: EdgeInsets.symmetric(
+                horizontal: isCompact ? 6 : 10,
+                vertical: isCompact ? 6 : 8,
+              ),
+              minimumSize: Size(isCompact ? 40 : 48, isCompact ? 40 : 48),
+            ),
+            icon: const Icon(Icons.format_list_bulleted, size: 16),
+            label: Text(
+              '${participants.length}',
+              style: const TextStyle(fontSize: 11, fontWeight: FontWeight.bold),
+            ),
+            onPressed: () => _showRosterSheet(
+              context: context,
+              participants: participants,
+              presences: presences,
+              leadPresence: leadPresence,
+              currentUid: currentUid,
+              colors: colors,
+            ),
+          ),
+        ],
+      ),
     );
   }
 
@@ -2211,16 +2171,16 @@ class _LiveGroupRideScreenState extends ConsumerState<LiveGroupRideScreen>
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Expanded(
+              Flexible(
                 child: Row(
+                  mainAxisSize: MainAxisSize.min,
                   children: [
                     Icon(Icons.stream, size: 13, color: colors.cyberCyan),
                     const SizedBox(width: 5),
-                    Expanded(
+                    Flexible(
                       child: Text(
                         'PACK TELEMETRY STREAM',
                         overflow: TextOverflow.ellipsis,
-                        maxLines: 1,
                         style: TextStyle(
                           color: colors.cyberCyan,
                           fontSize: 10,

lib/features/history/history_screen.dart

@@ -126,13 +126,13 @@ class _HistoryScreenState extends ConsumerState<HistoryScreen> {
                         padding: const EdgeInsets.all(12),
                         gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
                           maxCrossAxisExtent: 600,
-                          mainAxisExtent: 196,
+                          mainAxisExtent: 175,
                           crossAxisSpacing: 12,
                           mainAxisSpacing: 12,
                         ),
                         itemCount: rides.length,
                         itemBuilder: (context, index) {
-                          return _buildRideCard(context, rides[index], colors, isGrid: true);
+                          return _buildRideCard(context, rides[index], colors);
                         },
                       );
                     }
@@ -154,12 +154,7 @@ class _HistoryScreenState extends ConsumerState<HistoryScreen> {
     );
   }
 
-  Widget _buildRideCard(
+  Widget _buildRideCard(BuildContext context, Ride ride, MotorSignalThemeColors colors) {
-    BuildContext context,
-    Ride ride,
-    MotorSignalThemeColors colors, {
-    bool isGrid = false,
-  }) {
     final bikeName = (ride.motorcycleYear != null &&
             ride.motorcycleMake != null &&
             ride.motorcycleModel != null)
@@ -174,7 +169,7 @@ class _HistoryScreenState extends ConsumerState<HistoryScreen> {
 
     return Card(
       elevation: 2,
-      margin: isGrid ? EdgeInsets.zero : const EdgeInsets.symmetric(vertical: 6),
+      margin: const EdgeInsets.symmetric(vertical: 6),
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(12),
         side: BorderSide(color: colors.outlineVariant),

lib/features/map/map_screen.dart

@@ -995,8 +995,8 @@ class _MapScreenState extends ConsumerState<MapScreen> {
                     ),
                   ),
 
-                // Bottom Center: FIRE OFF REPLAY floating button (portrait only; in landscape play_replay_appbar_button is used)
+                // Bottom Center: FIRE OFF REPLAY floating button
-                if (_routePoints.isNotEmpty && !responsive.isLandscape)
+                if (_routePoints.isNotEmpty)
                   Positioned(
                     bottom: 24,
                     left: 20,

lib/features/performance/performance_launch_screen.dart

@@ -182,23 +182,21 @@ class _SetupView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final isLandscape = snapshot.isLandscape;
+    final isShortLandscape = snapshot.isLandscape && snapshot.isShortViewport;
 
-    if (isLandscape) {
+    if (isShortLandscape) {
       return Padding(
         padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
         child: Row(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
             Expanded(
               child: SingleChildScrollView(
-                physics: const ClampingScrollPhysics(),
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    _buildModeSelector(context, isLandscape: true),
+                    _buildModeSelector(context),
-                    const SizedBox(height: 8),
+                    const SizedBox(height: 12),
-                    _buildTargetSelector(context, isLandscape: true),
+                    _buildTargetSelector(context),
                   ],
                 ),
               ),
@@ -206,13 +204,12 @@ class _SetupView extends StatelessWidget {
             const SizedBox(width: 16),
             Expanded(
               child: SingleChildScrollView(
-                physics: const ClampingScrollPhysics(),
                 child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    _buildExplanationCard(context, isLandscape: true),
+                    _buildExplanationCard(context),
-                    const SizedBox(height: 10),
+                    const SizedBox(height: 12),
-                    _buildArmButton(context, isLandscape: true),
+                    _buildArmButton(context),
                   ],
                 ),
               ),
@@ -239,7 +236,7 @@ class _SetupView extends StatelessWidget {
     );
   }
 
-  Widget _buildModeSelector(BuildContext context, {bool isLandscape = false}) {
+  Widget _buildModeSelector(BuildContext context) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -247,13 +244,13 @@ class _SetupView extends StatelessWidget {
           'START MODE',
           style: TextStyle(
             fontFamily: AppTypography.fontHeadline,
-            fontSize: isLandscape ? 11 : 12,
+            fontSize: 12,
             fontWeight: FontWeight.w700,
             letterSpacing: 1.0,
             color: isDark ? Colors.white60 : Colors.black54,
           ),
         ),
-        SizedBox(height: isLandscape ? 6 : 8),
+        const SizedBox(height: 8),
         Row(
           children: [
             Expanded(
@@ -266,7 +263,6 @@ class _SetupView extends StatelessWidget {
                 onTap: () => onModeChanged(PerformanceLaunchMode.auto),
                 colors: colors,
                 isDark: isDark,
-                isLandscape: isLandscape,
               ),
             ),
             const SizedBox(width: 8),
@@ -280,7 +276,6 @@ class _SetupView extends StatelessWidget {
                 onTap: () => onModeChanged(PerformanceLaunchMode.countdown),
                 colors: colors,
                 isDark: isDark,
-                isLandscape: isLandscape,
               ),
             ),
           ],
@@ -289,7 +284,7 @@ class _SetupView extends StatelessWidget {
     );
   }
 
-  Widget _buildTargetSelector(BuildContext context, {bool isLandscape = false}) {
+  Widget _buildTargetSelector(BuildContext context) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -297,13 +292,13 @@ class _SetupView extends StatelessWidget {
           'BENCHMARK TARGET',
           style: TextStyle(
             fontFamily: AppTypography.fontHeadline,
-            fontSize: isLandscape ? 11 : 12,
+            fontSize: 12,
             fontWeight: FontWeight.w700,
             letterSpacing: 1.0,
             color: isDark ? Colors.white60 : Colors.black54,
           ),
         ),
-        SizedBox(height: isLandscape ? 6 : 8),
+        const SizedBox(height: 8),
         Row(
           children: [
             Expanded(
@@ -316,7 +311,6 @@ class _SetupView extends StatelessWidget {
                 onTap: () => onTargetChanged(PerformanceLaunchTarget.sixty),
                 colors: colors,
                 isDark: isDark,
-                isLandscape: isLandscape,
               ),
             ),
             const SizedBox(width: 8),
@@ -330,7 +324,6 @@ class _SetupView extends StatelessWidget {
                 onTap: () => onTargetChanged(PerformanceLaunchTarget.hundred),
                 colors: colors,
                 isDark: isDark,
-                isLandscape: isLandscape,
               ),
             ),
           ],
@@ -339,13 +332,13 @@ class _SetupView extends StatelessWidget {
     );
   }
 
-  Widget _buildExplanationCard(BuildContext context, {bool isLandscape = false}) {
+  Widget _buildExplanationCard(BuildContext context) {
     final text = selectedMode == PerformanceLaunchMode.auto
         ? 'Auto Launch:\nTiming begins immediately when MotorSignal detects validated motorcycle movement (≥ 1.0 MPH).'
         : 'Countdown:\nMonotonic 3 → 2 → 1 → GO cadence. Launch Reaction is measured from the scheduled GO instant.';
 
     return Container(
-      padding: EdgeInsets.all(isLandscape ? 10 : 14),
+      padding: const EdgeInsets.all(14),
       decoration: BoxDecoration(
         color: colors.surfaceContainer,
         borderRadius: BorderRadius.circular(12),
@@ -356,17 +349,17 @@ class _SetupView extends StatelessWidget {
         children: [
           Icon(
             Icons.info_outline,
-            size: isLandscape ? 18 : 20,
+            size: 20,
             color: colors.velocityBlue,
           ),
-          SizedBox(width: isLandscape ? 8 : 10),
+          const SizedBox(width: 10),
           Expanded(
             child: Text(
               text,
               style: TextStyle(
                 fontFamily: AppTypography.fontBody,
-                fontSize: isLandscape ? 11.5 : 13,
+                fontSize: 13,
-                height: 1.3,
+                height: 1.35,
                 color: isDark ? Colors.white70 : Colors.black87,
               ),
             ),
@@ -376,16 +369,15 @@ class _SetupView extends StatelessWidget {
     );
   }
 
-  Widget _buildArmButton(BuildContext context, {bool isLandscape = false}) {
+  Widget _buildArmButton(BuildContext context) {
     return SizedBox(
-      height: isLandscape ? 44 : 52,
+      height: 52,
-      width: double.infinity,
       child: ElevatedButton(
         key: const ValueKey('btn_arm_launch'),
         style: ElevatedButton.styleFrom(
           backgroundColor: colors.launchGreen,
           foregroundColor: Colors.black,
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14)),
           elevation: 2,
         ),
         onPressed: onArm,
@@ -393,7 +385,7 @@ class _SetupView extends StatelessWidget {
           'Arm Launch',
           style: TextStyle(
             fontFamily: AppTypography.fontHeadline,
-            fontSize: 15,
+            fontSize: 16,
             fontWeight: FontWeight.w700,
             letterSpacing: 0.5,
           ),
@@ -411,7 +403,6 @@ class _SelectionButton extends StatelessWidget {
   final VoidCallback onTap;
   final MotorSignalThemeColors colors;
   final bool isDark;
-  final bool isLandscape;
 
   const _SelectionButton({
     super.key,
@@ -422,7 +413,6 @@ class _SelectionButton extends StatelessWidget {
     required this.onTap,
     required this.colors,
     required this.isDark,
-    this.isLandscape = false,
   });
 
   @override
@@ -438,10 +428,7 @@ class _SelectionButton extends StatelessWidget {
         onTap: onTap,
         borderRadius: BorderRadius.circular(12),
         child: Container(
-          padding: EdgeInsets.symmetric(
+          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
-            horizontal: isLandscape ? 8 : 12,
-            vertical: isLandscape ? 8 : 12,
-          ),
           decoration: BoxDecoration(
             color: bgColor,
             borderRadius: BorderRadius.circular(12),
@@ -452,31 +439,27 @@ class _SelectionButton extends StatelessWidget {
             children: [
               Icon(
                 icon,
-                size: isLandscape ? 18 : 22,
+                size: 22,
                 color: isSelected ? colors.launchGreen : (isDark ? Colors.white70 : Colors.black54),
               ),
-              SizedBox(height: isLandscape ? 4 : 8),
+              const SizedBox(height: 8),
               Text(
                 title,
                 style: TextStyle(
                   fontFamily: AppTypography.fontHeadline,
-                  fontSize: isLandscape ? 13 : 15,
+                  fontSize: 15,
                   fontWeight: FontWeight.w800,
                   color: isDark ? Colors.white : Colors.black87,
                 ),
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
               ),
               const SizedBox(height: 2),
               Text(
                 subtitle,
                 style: TextStyle(
                   fontFamily: AppTypography.fontBody,
-                  fontSize: isLandscape ? 10 : 11,
+                  fontSize: 11,
                   color: isDark ? Colors.white60 : Colors.black54,
                 ),
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
               ),
             ],
           ),
@@ -525,48 +508,44 @@ class _WaitingView extends ConsumerWidget {
       statusColor = colors.velocityBlue;
     }
 
-    final isLandscape = snapshot.isLandscape;
+    return Padding(
-    return Center(
+      padding: const EdgeInsets.all(24),
-      child: SingleChildScrollView(
+      child: Column(
-        physics: const ClampingScrollPhysics(),
+        mainAxisAlignment: MainAxisAlignment.center,
-        padding: EdgeInsets.all(isLandscape ? 16 : 24),
+        crossAxisAlignment: CrossAxisAlignment.center,
-        child: Column(
+        children: [
-          mainAxisAlignment: MainAxisAlignment.center,
+          Icon(statusIcon, size: 54, color: statusColor),
-          crossAxisAlignment: CrossAxisAlignment.center,
+          const SizedBox(height: 20),
-          children: [
+          Text(
-            Icon(statusIcon, size: isLandscape ? 36 : 54, color: statusColor),
+            statusText,
-            SizedBox(height: isLandscape ? 10 : 20),
+            key: const ValueKey('waiting_status_text'),
-            Text(
+            textAlign: TextAlign.center,
-              statusText,
+            style: TextStyle(
-              key: const ValueKey('waiting_status_text'),
+              fontFamily: AppTypography.fontHeadline,
-              textAlign: TextAlign.center,
+              fontSize: 18,
-              style: TextStyle(
+              fontWeight: FontWeight.w800,
-                fontFamily: AppTypography.fontHeadline,
+              letterSpacing: 1.0,
-                fontSize: isLandscape ? 15 : 18,
+              color: statusColor,
-                fontWeight: FontWeight.w800,
-                letterSpacing: 1.0,
-                color: statusColor,
-              ),
             ),
-            SizedBox(height: isLandscape ? 6 : 12),
+          ),
-            Text(
+          const SizedBox(height: 12),
-              'Current speed: ${speed.toStringAsFixed(1)} MPH',
+          Text(
-              style: TextStyle(
+            'Current speed: ${speed.toStringAsFixed(1)} MPH',
-                fontFamily: AppTypography.fontTelemetry,
+            style: TextStyle(
-                fontSize: isLandscape ? 12 : 14,
+              fontFamily: AppTypography.fontTelemetry,
-                color: isDark ? Colors.white70 : Colors.black54,
+              fontSize: 14,
-              ),
+              color: isDark ? Colors.white70 : Colors.black54,
             ),
-            SizedBox(height: isLandscape ? 16 : 32),
+          ),
-            OutlinedButton(
+          const SizedBox(height: 32),
-              key: const ValueKey('btn_cancel_waiting'),
+          OutlinedButton(
-              onPressed: () {
+            key: const ValueKey('btn_cancel_waiting'),
-                ref.read(performanceLaunchProvider.notifier).reset();
+            onPressed: () {
-              },
+              ref.read(performanceLaunchProvider.notifier).reset();
-              child: const Text('Cancel'),
+            },
-            ),
+            child: const Text('Cancel'),
-          ],
+          ),
-        ),
+        ],
       ),
     );
   }
@@ -591,118 +570,108 @@ class _ReadyView extends ConsumerWidget {
     final mode = ref.watch(performanceLaunchProvider.select((s) => s.mode));
     final target = ref.watch(performanceLaunchProvider.select((s) => s.target));
     final isCountdown = mode == PerformanceLaunchMode.countdown;
-    final isLandscape = snapshot.isLandscape;
 
-    return Center(
+    return Padding(
-      child: SingleChildScrollView(
+      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
-        physics: const ClampingScrollPhysics(),
+      child: Column(
-        padding: EdgeInsets.symmetric(
+        mainAxisAlignment: MainAxisAlignment.center,
-          horizontal: isLandscape ? 32 : 20,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
-          vertical: isLandscape ? 8 : 16,
+        children: [
-        ),
+          Center(
-        child: Column(
+            child: Container(
-          mainAxisAlignment: MainAxisAlignment.center,
+              padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
-          crossAxisAlignment: CrossAxisAlignment.stretch,
+              decoration: BoxDecoration(
-          children: [
+                color: colors.launchGreen.withValues(alpha: 0.15),
-            Center(
+                borderRadius: BorderRadius.circular(16),
-              child: Container(
+                border: Border.all(color: colors.launchGreen, width: 2.0),
-                padding: EdgeInsets.symmetric(
-                  horizontal: isLandscape ? 16 : 24,
-                  vertical: isLandscape ? 4 : 8,
-                ),
-                decoration: BoxDecoration(
-                  color: colors.launchGreen.withValues(alpha: 0.15),
-                  borderRadius: BorderRadius.circular(16),
-                  border: Border.all(color: colors.launchGreen, width: 2.0),
-                ),
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Icon(Icons.check_circle, color: colors.launchGreen, size: isLandscape ? 20 : 28),
-                    const SizedBox(width: 8),
-                    Text(
-                      'READY',
-                      key: const ValueKey('ready_status_badge'),
-                      style: TextStyle(
-                        fontFamily: AppTypography.fontHeadline,
-                        fontSize: isLandscape ? 20 : 28,
-                        fontWeight: FontWeight.w900,
-                        letterSpacing: 2.0,
-                        color: colors.launchGreen,
-                      ),
-                    ),
-                  ],
-                ),
               ),
-            ),
+              child: Row(
-            SizedBox(height: isLandscape ? 8 : 20),
+                mainAxisSize: MainAxisSize.min,
-            Text(
+                children: [
-              target.label,
+                  Icon(Icons.check_circle, color: colors.launchGreen, size: 28),
-              textAlign: TextAlign.center,
+                  const SizedBox(width: 10),
-              style: TextStyle(
+                  Text(
-                fontFamily: AppTypography.fontHeadline,
+                    'READY',
-                fontSize: isLandscape ? 18 : 22,
+                    key: const ValueKey('ready_status_badge'),
-                fontWeight: FontWeight.w800,
-                color: isDark ? Colors.white : Colors.black87,
-              ),
-            ),
-            SizedBox(height: isLandscape ? 4 : 10),
-            Text(
-              isCountdown
-                  ? 'Tap below to initiate countdown'
-                  : 'Accelerate when ready',
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                fontFamily: AppTypography.fontBody,
-                fontSize: isLandscape ? 13 : 16,
-                fontWeight: FontWeight.w600,
-                color: isDark ? Colors.white70 : Colors.black54,
-              ),
-            ),
-            SizedBox(height: isLandscape ? 12 : 40),
-            if (isCountdown) ...[
-              SizedBox(
-                height: isLandscape ? 44 : 56,
-                child: ElevatedButton(
-                  key: const ValueKey('btn_start_countdown'),
-                  style: ElevatedButton.styleFrom(
-                    backgroundColor: colors.velocityBlue,
-                    foregroundColor: Colors.white,
-                    shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(16)),
-                    elevation: 4,
-                  ),
-                  onPressed: () {
-                    ref.read(performanceLaunchProvider.notifier).startCountdown();
-                  },
-                  child: const Text(
-                    'Start Countdown',
                     style: TextStyle(
                       fontFamily: AppTypography.fontHeadline,
-                      fontSize: 16,
+                      fontSize: 28,
-                      fontWeight: FontWeight.w700,
+                      fontWeight: FontWeight.w900,
-                      letterSpacing: 0.5,
+                      letterSpacing: 2.0,
+                      color: colors.launchGreen,
                     ),
                   ),
-                ),
+                ],
               ),
-              SizedBox(height: isLandscape ? 8 : 16),
+            ),
-            ],
+          ),
-            Center(
+          const SizedBox(height: 20),
-              child: TextButton(
+          Text(
+            target.label,
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              fontFamily: AppTypography.fontHeadline,
+              fontSize: 22,
+              fontWeight: FontWeight.w800,
+              color: isDark ? Colors.white : Colors.black87,
+            ),
+          ),
+          const SizedBox(height: 10),
+          Text(
+            isCountdown
+                ? 'Tap below to initiate countdown'
+                : 'Accelerate when ready',
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              fontFamily: AppTypography.fontBody,
+              fontSize: 16,
+              fontWeight: FontWeight.w600,
+              color: isDark ? Colors.white70 : Colors.black54,
+            ),
+          ),
+          const SizedBox(height: 40),
+          if (isCountdown) ...[
+            SizedBox(
+              height: 56,
+              child: ElevatedButton(
+                key: const ValueKey('btn_start_countdown'),
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: colors.velocityBlue,
+                  foregroundColor: Colors.white,
+                  shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(16)),
+                  elevation: 4,
+                ),
                 onPressed: () {
-                  ref.read(performanceLaunchProvider.notifier).reset();
+                  ref.read(performanceLaunchProvider.notifier).startCountdown();
                 },
-                child: Text(
+                child: const Text(
-                  'Cancel & Change Setup',
+                  'Start Countdown',
                   style: TextStyle(
-                    color: isDark ? Colors.white60 : Colors.black54,
+                    fontFamily: AppTypography.fontHeadline,
+                    fontSize: 16,
+                    fontWeight: FontWeight.w700,
+                    letterSpacing: 0.5,
                   ),
                 ),
               ),
             ),
+            const SizedBox(height: 16),
           ],
-        ),
+          Center(
+            child: TextButton(
+              onPressed: () {
+                ref.read(performanceLaunchProvider.notifier).reset();
+              },
+              child: Text(
+                'Cancel & Change Setup',
+                style: TextStyle(
+                  color: isDark ? Colors.white60 : Colors.black54,
+                ),
+              ),
+            ),
+          ),
+        ],
       ),
     );
   }

lib/features/replay/replay_screen.dart

@@ -7,7 +7,6 @@ import '../../database/database.dart';
 import '../../services/map/map_provider_interface.dart';
 import '../../services/map/unified_map_view.dart';
 import '../../core/theme/theme_extensions.dart';
-import '../../core/responsive/responsive_layout.dart';
 
 /// Corner performance metrics and apex grading for forensic telemetry replay.
 class CornerAnalysis {
@@ -475,120 +474,117 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
           ),
         ],
       ),
-      body: ResponsiveLayout(
+      body: Column(
-        builder: (context, snapshot) {
+        children: [
-          final isLandscape = snapshot.isLandscape;
+          // Map View (with multi-color lean heatmap and telemetry HUD overlay)
-
+          Expanded(
-          final mapWidget = Stack(
+            flex: 5,
-            children: [
+            child: Stack(
-              UnifiedMapView(
+              children: [
-                center: currentPos,
+                UnifiedMapView(
-                zoom: _zoom,
+                  center: currentPos,
-                markers: allMarkers,
+                  zoom: _zoom,
-                polylines: polylines,
+                  markers: allMarkers,
-                isFollowModeOverride: _isFollowingRider,
+                  polylines: polylines,
-                onUserInteraction: () {
+                  isFollowModeOverride: _isFollowingRider,
-                  if (_isFollowingRider) {
+                  onUserInteraction: () {
-                    setState(() => _isFollowingRider = false);
+                    if (_isFollowingRider) {
-                  }
+                      setState(() => _isFollowingRider = false);
-                },
+                    }
-              ),
+                  },
-              // Map Navigation Controls (Zoom In, Zoom Out, Recenter)
-              Positioned(
-                right: isLandscape ? 10 : 14,
-                bottom: isLandscape ? 10 : 14,
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    if (!_isFollowingRider) ...[
-                      _ReplayMapButton(
-                        key: const ValueKey('replay_recenter_button'),
-                        icon: Icons.my_location,
-                        tooltip: 'Recenter on Rider',
-                        color: colors.cyberCyan,
-                        backgroundColor: colors.cyberCyan.withValues(alpha: 0.25),
-                        isCompact: isLandscape,
-                        onTap: () => setState(() => _isFollowingRider = true),
-                      ),
-                      SizedBox(height: isLandscape ? 6 : 8),
-                    ],
-                    _ReplayMapButton(
-                      key: const ValueKey('replay_zoom_in_button'),
-                      icon: Icons.add,
-                      tooltip: 'Zoom In',
-                      isCompact: isLandscape,
-                      onTap: () => setState(() => _zoom = (_zoom + 1.0).clamp(3.0, 19.0)),
-                    ),
-                    SizedBox(height: isLandscape ? 6 : 8),
-                    _ReplayMapButton(
-                      key: const ValueKey('replay_zoom_out_button'),
-                      icon: Icons.remove,
-                      tooltip: 'Zoom Out',
-                      isCompact: isLandscape,
-                      onTap: () => setState(() => _zoom = (_zoom - 1.0).clamp(3.0, 19.0)),
-                    ),
-                  ],
                 ),
-              ),
+                // Map Navigation Controls (Zoom In, Zoom Out, Recenter)
-              // Telemetry Overlay
+                Positioned(
-              Positioned(
+                  right: 14,
-                top: isLandscape ? 8 : 14,
+                  bottom: 14,
-                left: isLandscape ? 8 : 14,
+                  child: Column(
-                right: isLandscape ? 8 : 14,
+                    mainAxisSize: MainAxisSize.min,
-                child: Center(
+                    children: [
-                  child: FittedBox(
+                      if (!_isFollowingRider) ...[
-                    fit: BoxFit.scaleDown,
+                        _ReplayMapButton(
-                    child: Row(
+                          key: const ValueKey('replay_recenter_button'),
-                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                          icon: Icons.my_location,
-                      children: [
+                          tooltip: 'Recenter on Rider',
-                        _buildOverlayStat('SPEED', '${currentSample.speed?.toStringAsFixed(0) ?? 0} mph', isLandscape: isLandscape),
+                          color: colors.cyberCyan,
-                        SizedBox(width: isLandscape ? 6 : 8),
+                          backgroundColor: colors.cyberCyan.withValues(alpha: 0.25),
-                        _buildOverlayStat('LEAN', '${currentSample.leanAngle?.abs().toStringAsFixed(0) ?? 0}°', isLandscape: isLandscape),
+                          onTap: () => setState(() => _isFollowingRider = true),
-                        SizedBox(width: isLandscape ? 6 : 8),
+                        ),
-                        _buildOverlayStat('G', '${currentSample.longitudinalG?.abs().toStringAsFixed(2) ?? 0}G', isLandscape: isLandscape),
+                        const SizedBox(height: 8),
                       ],
-                    ),
+                      _ReplayMapButton(
+                        key: const ValueKey('replay_zoom_in_button'),
+                        icon: Icons.add,
+                        tooltip: 'Zoom In',
+                        onTap: () => setState(() => _zoom = (_zoom + 1.0).clamp(3.0, 19.0)),
+                      ),
+                      const SizedBox(height: 8),
+                      _ReplayMapButton(
+                        key: const ValueKey('replay_zoom_out_button'),
+                        icon: Icons.remove,
+                        tooltip: 'Zoom Out',
+                        onTap: () => setState(() => _zoom = (_zoom - 1.0).clamp(3.0, 19.0)),
+                      ),
+                    ],
                   ),
                 ),
-              ),
+                // Telemetry Overlay
-              // Heatmap Legend Overlay
+                Positioned(
-              Positioned(
+                  top: 14,
-                bottom: isLandscape ? 8 : 10,
+                  left: 14,
-                left: isLandscape ? 8 : 14,
+                  right: 14,
-                right: isLandscape ? 60 : 14,
+                  child: Center(
-                child: Align(
+                    child: FittedBox(
-                  alignment: Alignment.centerLeft,
+                      fit: BoxFit.scaleDown,
-                  child: FittedBox(
-                    fit: BoxFit.scaleDown,
-                    child: Container(
-                      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),
-                      decoration: BoxDecoration(
-                        color: Colors.black.withValues(alpha: 0.8),
-                        borderRadius: BorderRadius.circular(8),
-                        border: Border.all(color: Colors.white24),
-                      ),
                       child: Row(
-                        mainAxisSize: MainAxisSize.min,
+                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                         children: [
-                          _buildLegendItem(Colors.amberAccent, '≤20°'),
+                          _buildOverlayStat('SPEED', '${currentSample.speed?.toStringAsFixed(0) ?? 0} mph'),
                           const SizedBox(width: 8),
-                          _buildLegendItem(Colors.cyanAccent, '20°-35°'),
+                          _buildOverlayStat('LEAN', '${currentSample.leanAngle?.abs().toStringAsFixed(0) ?? 0}°'),
                           const SizedBox(width: 8),
-                          _buildLegendItem(const Color(0xFFFF334B), '>35° Apex'),
+                          _buildOverlayStat('G', '${currentSample.longitudinalG?.abs().toStringAsFixed(2) ?? 0}G'),
                         ],
                       ),
                     ),
                   ),
                 ),
-              ),
+                // Heatmap Legend Overlay
-            ],
+                Positioned(
-          );
+                  bottom: 10,
-
+                  left: 14,
-          final playbackControlsBar = Container(
+                  right: 14,
-            padding: EdgeInsets.symmetric(
+                  child: Align(
-              horizontal: isLandscape ? 12 : 16,
+                    alignment: Alignment.centerLeft,
-              vertical: isLandscape ? 4 : 8,
+                    child: FittedBox(
+                      fit: BoxFit.scaleDown,
+                      child: Container(
+                        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),
+                        decoration: BoxDecoration(
+                          color: Colors.black.withValues(alpha: 0.8),
+                          borderRadius: BorderRadius.circular(8),
+                          border: Border.all(color: Colors.white24),
+                        ),
+                        child: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            _buildLegendItem(Colors.amberAccent, '≤20°'),
+                            const SizedBox(width: 8),
+                            _buildLegendItem(Colors.cyanAccent, '20°-35°'),
+                            const SizedBox(width: 8),
+                            _buildLegendItem(const Color(0xFFFF334B), '>35° Apex'),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ],
             ),
+          ),
+
+          // Playback Controls Bar
+          Container(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
             color: theme.colorScheme.surface,
             child: Column(
               mainAxisSize: MainAxisSize.min,
@@ -600,10 +596,10 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                       child: Text(
                         currentSample.timestamp.toLocal().toString().split('.')[0],
                         overflow: TextOverflow.ellipsis,
-                        style: TextStyle(
+                        style: const TextStyle(
                           color: Colors.cyanAccent,
                           fontWeight: FontWeight.bold,
-                          fontSize: isLandscape ? 11 : 12,
+                          fontSize: 12,
                           fontFamily: 'JetBrains Mono',
                         ),
                       ),
@@ -613,42 +609,30 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                       'Sample ${_currentIndex + 1} / ${_telemetry.length}',
                       style: TextStyle(
                         color: theme.colorScheme.onSurface.withValues(alpha: 0.6),
-                        fontSize: isLandscape ? 10 : 11,
+                        fontSize: 11,
                         fontFamily: 'JetBrains Mono',
                       ),
                     ),
                   ],
                 ),
-                SliderTheme(
+                Slider(
-                  data: isLandscape
+                  value: currentSliderValue,
-                      ? SliderTheme.of(context).copyWith(
+                  min: 0,
-                          trackHeight: 2,
+                  max: maxSliderValue,
-                          thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 6),
+                  onChanged: _telemetry.length > 1
-                          overlayShape: const RoundSliderOverlayShape(overlayRadius: 12),
+                      ? (val) {
-                        )
+                          setState(() {
-                      : SliderTheme.of(context),
+                            _currentIndex = val.toInt();
-                  child: Slider(
+                          });
-                    value: currentSliderValue,
+                        }
-                    min: 0,
+                      : null,
-                    max: maxSliderValue,
+                  activeColor: Colors.cyanAccent,
-                    onChanged: _telemetry.length > 1
-                        ? (val) {
-                            setState(() {
-                              _currentIndex = val.toInt();
-                            });
-                          }
-                        : null,
-                    activeColor: Colors.cyanAccent,
-                  ),
                 ),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     IconButton(
-                      visualDensity: isLandscape ? VisualDensity.compact : null,
+                      icon: const Icon(Icons.restart_alt),
-                      padding: isLandscape ? const EdgeInsets.all(4) : null,
-                      constraints: isLandscape ? const BoxConstraints() : null,
-                      icon: Icon(Icons.restart_alt, size: isLandscape ? 20 : 24),
                       tooltip: 'Restart',
                       onPressed: () {
                         setState(() {
@@ -656,46 +640,35 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                         });
                       },
                     ),
-                    SizedBox(width: isLandscape ? 8 : 16),
+                    const SizedBox(width: 16),
                     FloatingActionButton.small(
                       onPressed: _togglePlayback,
-                      child: Icon(_isPlaying ? Icons.pause : Icons.play_arrow, size: isLandscape ? 18 : 20),
+                      child: Icon(_isPlaying ? Icons.pause : Icons.play_arrow),
                     ),
-                    SizedBox(width: isLandscape ? 8 : 16),
+                    const SizedBox(width: 16),
                     TextButton(
-                      style: isLandscape
-                          ? TextButton.styleFrom(
-                              padding: const EdgeInsets.symmetric(horizontal: 8),
-                              visualDensity: VisualDensity.compact,
-                            )
-                          : null,
                       onPressed: _changeSpeed,
                       child: Text(
                         '${_playbackSpeed}x',
-                        style: TextStyle(
+                        style: const TextStyle(fontWeight: FontWeight.bold, fontFamily: 'JetBrains Mono'),
-                          fontWeight: FontWeight.bold,
-                          fontFamily: 'JetBrains Mono',
-                          fontSize: isLandscape ? 12 : 14,
-                        ),
                       ),
                     ),
                   ],
                 ),
               ],
             ),
-          );
+          ),
 
-          Widget buildCornerTable() {
+          // Corner Entry / Apex / Exit Breakdown Table
-            return Container(
+          Expanded(
+            flex: _corners.isEmpty ? 3 : 4,
+            child: Container(
               color: theme.colorScheme.surfaceContainerLow,
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
                   Container(
-                    padding: EdgeInsets.symmetric(
+                    padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8),
-                      horizontal: isLandscape ? 10 : 14,
-                      vertical: isLandscape ? 6 : 8,
-                    ),
                     color: theme.colorScheme.surfaceContainer,
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -705,7 +678,7 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                             'CORNER APEX BREAKDOWN & GRADING',
                             overflow: TextOverflow.ellipsis,
                             style: TextStyle(
-                              fontSize: isLandscape ? 10 : 11,
+                              fontSize: 11,
                               fontWeight: FontWeight.bold,
                               fontFamily: 'JetBrains Mono',
                               color: colors.cyberCyan,
@@ -717,7 +690,7 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                         Text(
                           _corners.isEmpty ? '' : 'Tap row to seek apex',
                           style: TextStyle(
-                            fontSize: isLandscape ? 9 : 10,
+                            fontSize: 10,
                             fontFamily: 'JetBrains Mono',
                             color: theme.colorScheme.onSurface.withValues(alpha: 0.5),
                           ),
@@ -739,7 +712,7 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                                   hasLeanData
                                       ? Icons.straighten_rounded
                                       : Icons.sensors_off_rounded,
-                                  size: isLandscape ? 22 : 26,
+                                  size: 26,
                                   color: hasLeanData
                                       ? colors.cyberCyan.withValues(alpha: 0.7)
                                       : colors.warningAmber.withValues(alpha: 0.8),
@@ -751,7 +724,7 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                                       : 'Sensor Fusion Uncalibrated / No Lean Telemetry',
                                   textAlign: TextAlign.center,
                                   style: TextStyle(
-                                    fontSize: isLandscape ? 11 : 12,
+                                    fontSize: 12,
                                     fontWeight: FontWeight.bold,
                                     color: theme.colorScheme.onSurface.withValues(alpha: 0.85),
                                     fontFamily: 'JetBrains Mono',
@@ -759,14 +732,14 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                                 ),
                                 const SizedBox(height: 4),
                                 ConstrainedBox(
-                                  constraints: BoxConstraints(maxWidth: isLandscape ? 320 : 280),
+                                  constraints: const BoxConstraints(maxWidth: 280),
                                   child: Text(
                                     hasLeanData
                                         ? 'Upright riding recorded. Lean angle remained below 15° throughout this session.'
                                         : 'Lean angle was not recorded or IMU was uncalibrated during this session.',
                                     textAlign: TextAlign.center,
                                     style: TextStyle(
-                                      fontSize: isLandscape ? 10 : 11,
+                                      fontSize: 11,
                                       color: theme.colorScheme.onSurface.withValues(alpha: 0.55),
                                       fontFamily: 'Inter',
                                     ),
@@ -798,49 +771,43 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                               });
                             },
                             child: Container(
-                              padding: EdgeInsets.symmetric(
+                              padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 9),
-                                horizontal: isLandscape ? 10 : 14,
-                                vertical: isLandscape ? 6 : 9,
-                              ),
                               color: isCurrent
                                   ? colors.cyberCyan.withValues(alpha: 0.12)
                                   : Colors.transparent,
-                              child: FittedBox(
+                              child: Row(
-                                fit: BoxFit.scaleDown,
+                                children: [
-                                alignment: Alignment.centerLeft,
+                                  // Corner ID & Direction
-                                child: Row(
+                                  SizedBox(
-                                  children: [
+                                    width: 75,
-                                    // Corner ID & Direction
+                                    child: Row(
-                                    SizedBox(
+                                      children: [
-                                      width: isLandscape ? 65 : 75,
+                                        Text(
-                                      child: Row(
+                                          'T${corner.id}',
-                                        children: [
+                                          style: const TextStyle(
-                                          Text(
+                                            fontWeight: FontWeight.bold,
-                                            'T${corner.id}',
+                                            fontFamily: 'JetBrains Mono',
-                                            style: TextStyle(
+                                            fontSize: 13,
-                                              fontWeight: FontWeight.bold,
-                                              fontFamily: 'JetBrains Mono',
-                                              fontSize: isLandscape ? 12 : 13,
-                                            ),
                                           ),
-                                          const SizedBox(width: 4),
+                                        ),
-                                          Text(
+                                        const SizedBox(width: 4),
-                                            corner.direction == 'Left' ? '↰ L' : '↱ R',
+                                        Text(
-                                            style: TextStyle(
+                                          corner.direction == 'Left' ? '↰ L' : '↱ R',
-                                              fontSize: isLandscape ? 10 : 11,
+                                          style: TextStyle(
-                                              fontWeight: FontWeight.bold,
+                                            fontSize: 11,
-                                              color: corner.direction == 'Left'
+                                            fontWeight: FontWeight.bold,
-                                                  ? Colors.blueAccent
+                                            color: corner.direction == 'Left'
-                                                  : Colors.greenAccent,
+                                                ? Colors.blueAccent
-                                              fontFamily: 'JetBrains Mono',
+                                                : Colors.greenAccent,
-                                            ),
+                                            fontFamily: 'JetBrains Mono',
                                           ),
-                                        ],
+                                        ),
-                                      ),
+                                      ],
                                     ),
-                                    const SizedBox(width: 8),
+                                  ),
-                                    // Entry Speed
+                                  // Entry Speed
-                                    Column(
+                                  Expanded(
+                                    child: Column(
                                       crossAxisAlignment: CrossAxisAlignment.start,
                                       children: [
                                         Text(
@@ -853,16 +820,14 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                                         ),
                                         Text(
                                           '${corner.entrySpeed.toStringAsFixed(0)} mph',
-                                          style: TextStyle(
+                                          style: const TextStyle(fontSize: 12, fontFamily: 'JetBrains Mono'),
-                                            fontSize: isLandscape ? 11 : 12,
-                                            fontFamily: 'JetBrains Mono',
-                                          ),
                                         ),
                                       ],
                                     ),
-                                    SizedBox(width: isLandscape ? 10 : 14),
+                                  ),
-                                    // Apex Speed & Lean
+                                  // Apex Speed & Lean
-                                    Column(
+                                  Expanded(
+                                    child: Column(
                                       crossAxisAlignment: CrossAxisAlignment.start,
                                       children: [
                                         Text(
@@ -876,7 +841,7 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                                         Text(
                                           '${corner.apexSpeed.toStringAsFixed(0)} mph • ${corner.apexLeanAngle.toStringAsFixed(0)}°',
                                           style: TextStyle(
-                                            fontSize: isLandscape ? 11 : 12,
+                                            fontSize: 12,
                                             fontWeight: FontWeight.bold,
                                             color: colors.cyberCyan,
                                             fontFamily: 'JetBrains Mono',
@@ -884,9 +849,10 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                                         ),
                                       ],
                                     ),
-                                    SizedBox(width: isLandscape ? 10 : 14),
+                                  ),
-                                    // Exit Speed & Delta
+                                  // Exit Speed & Delta
-                                    Column(
+                                  Expanded(
+                                    child: Column(
                                       crossAxisAlignment: CrossAxisAlignment.start,
                                       children: [
                                         Text(
@@ -900,34 +866,33 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                                         Text(
                                           '${corner.exitSpeed.toStringAsFixed(0)} mph (${corner.speedDelta >= 0 ? '+' : ''}${corner.speedDelta.toStringAsFixed(0)})',
                                           style: TextStyle(
-                                            fontSize: isLandscape ? 11 : 12,
+                                            fontSize: 12,
                                             color: corner.speedDelta >= 0 ? Colors.greenAccent : Colors.orangeAccent,
                                             fontFamily: 'JetBrains Mono',
                                           ),
                                         ),
                                       ],
                                     ),
-                                    SizedBox(width: isLandscape ? 10 : 14),
+                                  ),
-                                    // Grade Badge
+                                  // Grade Badge
-                                    Container(
+                                  Container(
-                                      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
+                                    padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
-                                      decoration: BoxDecoration(
+                                    decoration: BoxDecoration(
-                                        color: corner.getGradeColor().withValues(alpha: 0.15),
+                                      color: corner.getGradeColor().withValues(alpha: 0.15),
-                                        borderRadius: BorderRadius.circular(6),
+                                      borderRadius: BorderRadius.circular(6),
-                                        border: Border.all(color: corner.getGradeColor().withValues(alpha: 0.5)),
+                                      border: Border.all(color: corner.getGradeColor().withValues(alpha: 0.5)),
-                                      ),
+                                    ),
-                                      child: Text(
+                                    child: Text(
-                                        corner.grade,
+                                      corner.grade,
-                                        style: TextStyle(
+                                      style: TextStyle(
-                                          fontSize: 11,
+                                        fontSize: 11,
-                                          fontWeight: FontWeight.bold,
+                                        fontWeight: FontWeight.bold,
-                                          fontFamily: 'JetBrains Mono',
+                                        fontFamily: 'JetBrains Mono',
-                                          color: corner.getGradeColor(),
+                                        color: corner.getGradeColor(),
-                                        ),
                                       ),
                                     ),
-                                  ],
+                                  ),
-                                ),
+                                ],
                               ),
                             ),
                           );
@@ -936,46 +901,9 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
                     ),
                 ],
               ),
-            );
+            ),
-          }
+          ),
-
+        ],
-          if (isLandscape) {
-            return Row(
-              crossAxisAlignment: CrossAxisAlignment.stretch,
-              children: [
-                Expanded(
-                  flex: 5,
-                  child: mapWidget,
-                ),
-                Expanded(
-                  flex: 4,
-                  child: Column(
-                    children: [
-                      playbackControlsBar,
-                      Expanded(
-                        child: buildCornerTable(),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            );
-          }
-
-          return Column(
-            children: [
-              Expanded(
-                flex: 5,
-                child: mapWidget,
-              ),
-              playbackControlsBar,
-              Expanded(
-                flex: _corners.isEmpty ? 3 : 4,
-                child: buildCornerTable(),
-              ),
-            ],
-          );
-        },
       ),
     );
   }
@@ -998,28 +926,18 @@ class _ReplayScreenState extends ConsumerState<ReplayScreen> {
     );
   }
 
-  Widget _buildOverlayStat(String label, String value, {bool isLandscape = false}) {
+  Widget _buildOverlayStat(String label, String value) {
     return Container(
-      padding: EdgeInsets.symmetric(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-        horizontal: isLandscape ? 10 : 16,
-        vertical: isLandscape ? 4 : 8,
-      ),
       decoration: BoxDecoration(
         color: Colors.black87,
-        borderRadius: BorderRadius.circular(isLandscape ? 8 : 12),
+        borderRadius: BorderRadius.circular(12),
         border: Border.all(color: Colors.cyanAccent.withValues(alpha: 0.5)),
       ),
       child: Column(
         children: [
-          Text(label, style: TextStyle(fontSize: isLandscape ? 8.5 : 10, color: Colors.white70)),
+          Text(label, style: const TextStyle(fontSize: 10, color: Colors.white70)),
-          Text(
+          Text(value, style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold, color: Colors.cyanAccent)),
-            value,
-            style: TextStyle(
-              fontSize: isLandscape ? 15 : 20,
-              fontWeight: FontWeight.bold,
-              color: Colors.cyanAccent,
-            ),
-          ),
         ],
       ),
     );
@@ -1032,7 +950,6 @@ class _ReplayMapButton extends StatelessWidget {
   final VoidCallback onTap;
   final Color? color;
   final Color? backgroundColor;
-  final bool isCompact;
 
   const _ReplayMapButton({
     super.key,
@@ -1041,13 +958,10 @@ class _ReplayMapButton extends StatelessWidget {
     required this.onTap,
     this.color,
     this.backgroundColor,
-    this.isCompact = false,
   });
 
   @override
   Widget build(BuildContext context) {
-    final size = isCompact ? 36.0 : 48.0;
-    final iconSize = isCompact ? 18.0 : 24.0;
     return Material(
       color: backgroundColor ?? Colors.black87,
       shape: RoundedRectangleBorder(
@@ -1060,12 +974,12 @@ class _ReplayMapButton extends StatelessWidget {
         child: Tooltip(
           message: tooltip,
           child: SizedBox(
-            width: size,
+            width: 48,
-            height: size,
+            height: 48,
             child: Icon(
               icon,
               color: color ?? Colors.white,
-              size: iconSize,
+              size: 24,
             ),
           ),
         ),

lib/features/routes/route_planner_screen.dart

@@ -7,7 +7,6 @@ import '../../core/responsive/viewport_size.dart';
 import '../../core/theme/theme_extensions.dart';
 import '../../services/auth/auth_providers.dart';
 import '../../services/map/map_provider_interface.dart';
-import '../../services/map/map_providers.dart';
 import '../../services/map/unified_map_view.dart';
 import '../../services/routes/navigation_handoff.dart';
 import '../../services/routes/route_models.dart';
@@ -44,8 +43,6 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!mounted) return;
-      ref.read(mapFollowStateProvider.notifier).recenter();
       _loadInitialData();
     });
   }
@@ -151,33 +148,8 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
       context: context,
       builder: (dialogCtx) => StatefulBuilder(
         builder: (context, setDialogState) {
-          final screenSize = MediaQuery.sizeOf(context);
-          final isCompactDialog = screenSize.height < 480;
           return AlertDialog(
-            scrollable: true,
             backgroundColor: colors.surfaceContainer,
-            insetPadding: EdgeInsets.symmetric(
-              horizontal: 16,
-              vertical: isCompactDialog ? 8 : 24,
-            ),
-            titlePadding: EdgeInsets.fromLTRB(
-              20,
-              isCompactDialog ? 12 : 20,
-              20,
-              0,
-            ),
-            contentPadding: EdgeInsets.fromLTRB(
-              20,
-              isCompactDialog ? 10 : 16,
-              20,
-              isCompactDialog ? 8 : 16,
-            ),
-            actionsPadding: EdgeInsets.fromLTRB(
-              16,
-              0,
-              16,
-              isCompactDialog ? 8 : 16,
-            ),
             shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(16),
               side: BorderSide(color: colors.outlineVariant),
@@ -189,8 +161,7 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
                 fontWeight: FontWeight.bold,
               ),
             ),
-            content: ConstrainedBox(
+            content: SingleChildScrollView(
-              constraints: const BoxConstraints(maxWidth: 440),
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -225,7 +196,6 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
                   const SizedBox(height: 12),
                   TextField(
                     controller: nameCtrl,
-                    scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
                     style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
                     decoration: InputDecoration(
                       labelText: 'Stop Name *',
@@ -596,16 +566,12 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
     const maxAllowed = RouteService.maxTechnicalStops;
     final isAtLimit = state.stops.length >= maxAllowed;
 
-    final lastKnownLocation = ref.watch(routePlannerLocationProvider).valueOrNull;
+    // Center map on road geometry, first stop, or default
-
-    // Route context takes priority over cached rider location and the US overview.
     final mapCenter = state.geometry.isNotEmpty
         ? state.geometry.first
         : (state.stops.isNotEmpty
             ? AppLatLng(state.stops.first.latitude, state.stops.first.longitude)
-            : lastKnownLocation ?? const AppLatLng(39.5, -98.35));
+            : const AppLatLng(37.7749, -122.4194));
-    final mapZoom = state.geometry.isNotEmpty || state.stops.isNotEmpty || lastKnownLocation != null
-        ? 12.0 : 3.0;
 
     // Build markers
     final markers = state.stops.map((stop) {
@@ -663,14 +629,11 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
       );
     }
 
-    final isCompactScreen = MediaQuery.sizeOf(context).height < 500;
-
     return Scaffold(
       backgroundColor: colors.surfaceContainer,
       appBar: AppBar(
         backgroundColor: colors.surfaceContainerHigh,
         elevation: 0,
-        toolbarHeight: isCompactScreen ? 46 : kToolbarHeight,
         leading: IconButton(
           icon: Icon(Icons.arrow_back, color: Theme.of(context).colorScheme.onSurface),
           onPressed: () => context.pop(),
@@ -719,18 +682,16 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
           final isNarrow = snapshot.width < 360;
           final isExpandedLayout =
               snapshot.sizeClass == WindowSizeClass.expanded ||
-              (snapshot.isLandscape && snapshot.width >= 600);
+              (snapshot.isLandscape && snapshot.width >= 720);
 
           if (isExpandedLayout) {
             return _buildExpandedLayout(
               context,
               colors,
-              snapshot,
               state,
               maxAllowed,
               isAtLimit,
               mapCenter,
-              mapZoom,
               markers,
               polylines,
               isNarrow,
@@ -745,7 +706,6 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
             maxAllowed,
             isAtLimit,
             mapCenter,
-            mapZoom,
             markers,
             polylines,
             isNarrow,
@@ -758,20 +718,14 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
   Widget _buildExpandedLayout(
     BuildContext context,
     MotorSignalThemeColors colors,
-    ResponsiveSnapshot snapshot,
     RoutePlannerState state,
     int maxAllowed,
     bool isAtLimit,
     AppLatLng mapCenter,
-    double mapZoom,
     List<AppMapMarker> markers,
     List<AppPolyline> polylines,
     bool isNarrow,
   ) {
-    final isCompactHeight = snapshot.height < 500;
-    final isVeryCompactHeight = snapshot.height < 360;
-    final showDisclaimer = snapshot.height >= 260;
-
     return Row(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
@@ -789,29 +743,22 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
                 UnifiedMapView(
                   key: const ValueKey('route_planner_map_expanded'),
                   center: mapCenter,
-                  zoom: mapZoom,
+                  zoom: 12.0,
                   markers: markers,
                   polylines: polylines,
                 ),
                 Positioned(
-                  top: isCompactHeight ? 6 : 12,
+                  top: 12,
-                  left: isCompactHeight ? 8 : 12,
+                  left: 12,
-                  right: isCompactHeight ? 8 : 12,
+                  right: 12,
-                  child: _buildHudOverlay(
+                  child: _buildHudOverlay(colors, state, maxAllowed, isAtLimit, false),
-                    colors,
+                ),
-                    state,
+                Positioned(
-                    maxAllowed,
+                  bottom: 8,
-                    isAtLimit,
+                  left: 12,
-                    isCompactHeight,
+                  right: 12,
-                  ),
+                  child: _buildDisclaimerText(),
                 ),
-                if (showDisclaimer)
-                  Positioned(
-                    bottom: 6,
-                    left: 8,
-                    right: 8,
-                    child: _buildDisclaimerText(),
-                  ),
               ],
             ),
           ),
@@ -820,56 +767,23 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
         // Right Column: Form inputs + Stop list
         Expanded(
           flex: 6,
-          child: isCompactHeight
+          child: Column(
-              ? _buildStopsList(
+            children: [
-                  colors,
+              if (_errorMessage != null) _buildErrorBanner(colors),
-                  state,
+              Padding(
-                  true,
+                padding: const EdgeInsets.all(16),
-                  isVeryCompactHeight,
+                child: _buildRouteInfoInputs(colors, false),
-                  header: Column(
+              ),
-                    mainAxisSize: MainAxisSize.min,
+              Divider(color: colors.outlineVariant, height: 1),
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
+              Padding(
-                    children: [
+                padding: const EdgeInsets.all(12),
-                      if (_errorMessage != null) _buildErrorBanner(colors),
+                child: _buildStopControls(colors, state, isNarrow, false),
-                      Padding(
+              ),
-                        padding: const EdgeInsets.fromLTRB(12, 6, 12, 4),
+              Expanded(
-                        child: _buildRouteInfoInputs(colors, true),
+                child: _buildStopsList(colors, state, false, false),
-                      ),
+              ),
-                      Divider(color: colors.outlineVariant, height: 1),
+            ],
-                      Padding(
+          ),
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 12,
-                          vertical: 6,
-                        ),
-                        child:
-                            _buildStopControls(colors, state, isNarrow, true),
-                      ),
-                      if (state.stops.isEmpty)
-                        _buildEmptyStopsContent(
-                          colors,
-                          true,
-                          isVeryCompactHeight,
-                        ),
-                    ],
-                  ),
-                )
-              : Column(
-                  children: [
-                    if (_errorMessage != null) _buildErrorBanner(colors),
-                    Padding(
-                      padding: const EdgeInsets.all(16),
-                      child: _buildRouteInfoInputs(colors, false),
-                    ),
-                    Divider(color: colors.outlineVariant, height: 1),
-                    Padding(
-                      padding: const EdgeInsets.all(12),
-                      child: _buildStopControls(colors, state, isNarrow, false),
-                    ),
-                    Expanded(
-                      child: _buildStopsList(colors, state, false, false),
-                    ),
-                  ],
-                ),
         ),
       ],
     );
@@ -883,7 +797,6 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
     int maxAllowed,
     bool isAtLimit,
     AppLatLng mapCenter,
-    double mapZoom,
     List<AppMapMarker> markers,
     List<AppPolyline> polylines,
     bool isNarrow,
@@ -916,65 +829,6 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
       showDisclaimer = false;
     }
 
-    if (isCompactHeight) {
-      return _buildStopsList(
-        colors,
-        state,
-        true,
-        isVeryCompactHeight,
-        header: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            if (_errorMessage != null) _buildErrorBanner(colors),
-            if (mapHeight > 0)
-              SizedBox(
-                height: mapHeight,
-                width: double.infinity,
-                child: Stack(
-                  children: [
-                    UnifiedMapView(
-                      key: const ValueKey('route_planner_map_compact'),
-                      center: mapCenter,
-                      zoom: 12.0,
-                      markers: markers,
-                      polylines: polylines,
-                    ),
-                    Positioned(
-                      top: 4,
-                      left: 8,
-                      right: 8,
-                      child: _buildHudOverlay(
-                        colors,
-                        state,
-                        maxAllowed,
-                        isAtLimit,
-                        true,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            Padding(
-              padding: const EdgeInsets.symmetric(vertical: 2),
-              child: _buildRouteInfoInputs(colors, true),
-            ),
-            Divider(color: colors.outlineVariant, height: 1),
-            Padding(
-              padding: const EdgeInsets.symmetric(vertical: 4),
-              child: _buildStopControls(colors, state, isNarrow, true),
-            ),
-            if (state.stops.isEmpty)
-              _buildEmptyStopsContent(
-                colors,
-                true,
-                isVeryCompactHeight,
-              ),
-          ],
-        ),
-      );
-    }
-
     return Column(
       children: [
         if (_errorMessage != null) _buildErrorBanner(colors),
@@ -989,12 +843,12 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
                 UnifiedMapView(
                   key: const ValueKey('route_planner_map_compact'),
                   center: mapCenter,
-                  zoom: mapZoom,
+                  zoom: 12.0,
                   markers: markers,
                   polylines: polylines,
                 ),
                 Positioned(
-                  top: 8,
+                  top: isCompactHeight ? 4 : 8,
                   left: 8,
                   right: 8,
                   child: _buildHudOverlay(
@@ -1002,7 +856,7 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
                     state,
                     maxAllowed,
                     isAtLimit,
-                    false,
+                    isCompactHeight,
                   ),
                 ),
                 if (showDisclaimer)
@@ -1018,16 +872,24 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
 
         // Route Info Inputs
         Padding(
-          padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
+          padding: EdgeInsets.fromLTRB(
-          child: _buildRouteInfoInputs(colors, false),
+            16,
+            isCompactHeight ? 4 : 12,
+            16,
+            isCompactHeight ? 2 : 4,
+          ),
+          child: _buildRouteInfoInputs(colors, isCompactHeight),
         ),
 
         Divider(color: colors.outlineVariant, height: 1),
 
         // Stop List Controls
         Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+          padding: EdgeInsets.symmetric(
-          child: _buildStopControls(colors, state, isNarrow, false),
+            horizontal: 16,
+            vertical: isCompactHeight ? 4 : 8,
+          ),
+          child: _buildStopControls(colors, state, isNarrow, isCompactHeight),
         ),
 
         // Reorderable Stop List
@@ -1035,7 +897,7 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
           child: _buildStopsList(
             colors,
             state,
-            false,
+            isCompactHeight,
             isVeryCompactHeight,
           ),
         ),
@@ -1210,7 +1072,6 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
       children: [
         TextField(
           controller: _titleController,
-          scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
           style: TextStyle(
             color: onSurface,
             fontWeight: FontWeight.bold,
@@ -1302,17 +1163,15 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
           colors: colors,
           isCompact: isCompactHeight,
         ),
-        SizedBox(height: isCompactHeight ? 6 : 8),
+        const SizedBox(height: 8),
         Wrap(
           spacing: 8,
-          runSpacing: 6,
+          runSpacing: 8,
           alignment: WrapAlignment.spaceBetween,
           crossAxisAlignment: WrapCrossAlignment.center,
           children: [
-            Wrap(
+            Row(
-              spacing: 8,
+              mainAxisSize: MainAxisSize.min,
-              runSpacing: 6,
-              crossAxisAlignment: WrapCrossAlignment.center,
               children: [
                 ElevatedButton.icon(
                   key: const ValueKey('route_planner_add_stop_button'),
@@ -1322,20 +1181,17 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
                   style: ElevatedButton.styleFrom(
                     backgroundColor: colors.cyberCyan,
                     foregroundColor: Colors.black,
-                    padding: EdgeInsets.symmetric(
+                    padding: const EdgeInsets.symmetric(
                       horizontal: 10,
-                      vertical: isCompactHeight ? 6 : 8,
+                      vertical: 8,
                     ),
-                    minimumSize: isCompactHeight ? const Size(0, 34) : null,
-                    tapTargetSize: isCompactHeight
-                        ? MaterialTapTargetSize.shrinkWrap
-                        : null,
                     textStyle: const TextStyle(
                       fontSize: 12,
                       fontWeight: FontWeight.bold,
                     ),
                   ),
                 ),
+                const SizedBox(width: 8),
                 OutlinedButton.icon(
                   key: const ValueKey('route_planner_current_gps_button'),
                   onPressed: _addCurrentLocationStop,
@@ -1350,14 +1206,10 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
                   ),
                   style: OutlinedButton.styleFrom(
                     side: BorderSide(color: colors.outlineVariant),
-                    padding: EdgeInsets.symmetric(
+                    padding: const EdgeInsets.symmetric(
                       horizontal: 10,
-                      vertical: isCompactHeight ? 6 : 8,
+                      vertical: 8,
                     ),
-                    minimumSize: isCompactHeight ? const Size(0, 34) : null,
-                    tapTargetSize: isCompactHeight
-                        ? MaterialTapTargetSize.shrinkWrap
-                        : null,
                     textStyle: const TextStyle(fontSize: 12),
                   ),
                 ),
@@ -1396,74 +1248,56 @@ class _RoutePlannerScreenState extends ConsumerState<RoutePlannerScreen> {
     );
   }
 
-  Widget _buildEmptyStopsContent(
-    MotorSignalThemeColors colors,
-    bool isCompactHeight,
-    bool isVeryCompactHeight,
-  ) {
-    final theme = Theme.of(context);
-    final onSurfaceVariant = theme.colorScheme.onSurfaceVariant;
-
-    return Padding(
-      padding: EdgeInsets.symmetric(vertical: isCompactHeight ? 6 : 12),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          if (!isVeryCompactHeight) ...[
-            Icon(
-              Icons.alt_route,
-              size: isCompactHeight ? 28 : 48,
-              color: onSurfaceVariant.withValues(alpha: 0.2),
-            ),
-            SizedBox(height: isCompactHeight ? 4 : 12),
-          ],
-          Text(
-            'No stops added yet.',
-            style: TextStyle(
-              color: onSurfaceVariant,
-              fontSize: isCompactHeight ? 13 : 14,
-            ),
-          ),
-          const SizedBox(height: 4),
-          Text(
-            'Tap "Add Stop" or "Current GPS" to begin planning.',
-            style: TextStyle(
-              color: onSurfaceVariant.withValues(alpha: 0.6),
-              fontSize: isCompactHeight ? 11 : 12,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
   Widget _buildStopsList(
     MotorSignalThemeColors colors,
     RoutePlannerState state,
     bool isCompactHeight,
-    bool isVeryCompactHeight, {
+    bool isVeryCompactHeight,
-    Widget? header,
+  ) {
-  }) {
     final theme = Theme.of(context);
     final onSurface = theme.colorScheme.onSurface;
     final onSurfaceVariant = theme.colorScheme.onSurfaceVariant;
 
-    if (header == null && state.stops.isEmpty) {
+    if (state.stops.isEmpty) {
       return Center(
         child: SingleChildScrollView(
           physics: const ClampingScrollPhysics(),
-          child: _buildEmptyStopsContent(
+          child: Padding(
-            colors,
+            padding: const EdgeInsets.symmetric(vertical: 4),
-            isCompactHeight,
+            child: Column(
-            isVeryCompactHeight,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                if (!isVeryCompactHeight) ...[
+                  Icon(
+                    Icons.alt_route,
+                    size: isCompactHeight ? 32 : 48,
+                    color: onSurfaceVariant.withValues(alpha: 0.2),
+                  ),
+                  SizedBox(height: isCompactHeight ? 6 : 12),
+                ],
+                Text(
+                  'No stops added yet.',
+                  style: TextStyle(
+                    color: onSurfaceVariant,
+                    fontSize: 14,
+                  ),
+                ),
+                const SizedBox(height: 4),
+                Text(
+                  'Tap "Add Stop" or "Current GPS" to begin planning.',
+                  style: TextStyle(
+                    color: onSurfaceVariant.withValues(alpha: 0.6),
+                    fontSize: 12,
+                  ),
+                ),
+              ],
+            ),
           ),
         ),
       );
     }
 
     return ReorderableListView.builder(
-      header: header,
-      keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
       padding: const EdgeInsets.symmetric(
         horizontal: 16,
         vertical: 4,

lib/features/routes/widgets/address_autocomplete_field.dart

@@ -302,7 +302,6 @@ class _AddressAutocompleteFieldState
           focusNode: _focusNode,
           enabled: widget.enabled && !_isResolving,
           autofocus: widget.autofocus,
-          scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
           style: TextStyle(color: onSurface, fontSize: 14),
           onChanged: _onTextChanged,
           validator: (val) {

lib/features/social/clubs/club_detail_screen.dart

@@ -353,10 +353,8 @@ class _ClubDetailScreenState extends ConsumerState<ClubDetailScreen> {
               ),
               _buildPill(
                 icon: club.admissionPolicy == ClubAdmissionPolicy.open
-                    ? Icons.group_add_outlined
+                    ? Icons.lock_open_outlined
-                    : (club.admissionPolicy == ClubAdmissionPolicy.request
+                    : Icons.how_to_reg_outlined,
-                        ? Icons.how_to_reg_outlined
-                        : Icons.mail_outline),
                 label: club.admissionPolicy.label,
                 colors: colors,
                 theme: theme,

lib/features/social/clubs/club_membership_presentation.dart

@@ -119,9 +119,9 @@ class ClubMembershipPresentation {
       );
     }
 
-    // Root ownership remains authoritative when the member record is missing or stale.
+    // Authenticated user with an active membership
-    if (club.ownerUid == currentUserId || member?.isActive == true) {
+    if (member != null && member.status == ClubMemberStatus.active) {
-      final isOwner = member?.role == ClubRole.owner || club.ownerUid == currentUserId;
+      final isOwner = member.role == ClubRole.owner || club.ownerUid == currentUserId;
       if (isOwner) {
         return const ClubMembershipPresentation(
           state: ClubMembershipPresentationState.activeOwner,
@@ -135,7 +135,7 @@ class ClubMembershipPresentation {
         );
       }
 
-      if (member?.role == ClubRole.admin) {
+      if (member.role == ClubRole.admin) {
         return const ClubMembershipPresentation(
           state: ClubMembershipPresentationState.activeAdmin,
           statusBadge: 'ADMIN',

lib/features/social/clubs/clubs_hub_screen.dart

@@ -356,45 +356,11 @@ class _ClubsHubScreenState extends ConsumerState<ClubsHubScreen>
                   ),
                 ),
               ),
-            LayoutBuilder(
+            for (final member in memberships)
-              builder: (context, constraints) {
+              ClubMemberCard(
-                final isLandscape = MediaQuery.sizeOf(context).width > MediaQuery.sizeOf(context).height;
+                key: ValueKey('my_club_${member.clubId}'),
-                final useGrid = isLandscape || constraints.maxWidth >= 600;
+                member: member,
-
+              ),
-                if (useGrid) {
-                  return GridView.builder(
-                    shrinkWrap: true,
-                    physics: const NeverScrollableScrollPhysics(),
-                    gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                      crossAxisCount: 2,
-                      crossAxisSpacing: 12,
-                      mainAxisSpacing: 12,
-                      mainAxisExtent: 215,
-                    ),
-                    itemCount: memberships.length,
-                    itemBuilder: (context, index) {
-                      return ClubMemberCard(
-                        key: ValueKey('my_club_${memberships[index].clubId}'),
-                        member: memberships[index],
-                        inGrid: true,
-                      );
-                    },
-                  );
-                }
-
-                return ListView.builder(
-                  shrinkWrap: true,
-                  physics: const NeverScrollableScrollPhysics(),
-                  itemCount: memberships.length,
-                  itemBuilder: (context, index) {
-                    return ClubMemberCard(
-                      key: ValueKey('my_club_${memberships[index].clubId}'),
-                      member: memberships[index],
-                    );
-                  },
-                );
-              },
-            ),
           ],
         ],
       ),
@@ -605,19 +571,9 @@ class _ClubsHubScreenState extends ConsumerState<ClubsHubScreen>
               ),
             ],
           ),
-          LayoutBuilder(
+          ClubCard(
-            builder: (context, constraints) {
+            club: _searchedClub!,
-              final isLandscape = MediaQuery.sizeOf(context).width > MediaQuery.sizeOf(context).height;
+            onTap: () => context.push('/social/clubs/${_searchedClub!.id}'),
-              return ConstrainedBox(
-                constraints: BoxConstraints(
-                  maxWidth: isLandscape ? 400 : double.infinity,
-                ),
-                child: ClubCard(
-                  club: _searchedClub!,
-                  onTap: () => context.push('/social/clubs/${_searchedClub!.id}'),
-                ),
-              );
-            },
           ),
         ],
       );
@@ -675,46 +631,16 @@ class _ClubsHubScreenState extends ConsumerState<ClubsHubScreen>
           );
         }
 
-        return LayoutBuilder(
+        return ListView.builder(
-          builder: (context, constraints) {
+          shrinkWrap: true,
-            final isLandscape = MediaQuery.sizeOf(context).width > MediaQuery.sizeOf(context).height;
+          physics: const NeverScrollableScrollPhysics(),
-            final useGrid = isLandscape || constraints.maxWidth >= 600;
+          itemCount: clubs.length,
-
+          itemBuilder: (context, index) {
-            if (useGrid) {
+            final club = clubs[index];
-              return GridView.builder(
+            return ClubCard(
-                shrinkWrap: true,
+              key: ValueKey('discover_club_${club.id}'),
-                physics: const NeverScrollableScrollPhysics(),
+              club: club,
-                gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+              onTap: () => context.push('/social/clubs/${club.id}'),
-                  crossAxisCount: 2,
-                  crossAxisSpacing: 12,
-                  mainAxisSpacing: 12,
-                  mainAxisExtent: 215,
-                ),
-                itemCount: clubs.length,
-                itemBuilder: (context, index) {
-                  final club = clubs[index];
-                  return ClubCard(
-                    key: ValueKey('discover_club_${club.id}'),
-                    club: club,
-                    inGrid: true,
-                    onTap: () => context.push('/social/clubs/${club.id}'),
-                  );
-                },
-              );
-            }
-
-            return ListView.builder(
-              shrinkWrap: true,
-              physics: const NeverScrollableScrollPhysics(),
-              itemCount: clubs.length,
-              itemBuilder: (context, index) {
-                final club = clubs[index];
-                return ClubCard(
-                  key: ValueKey('discover_club_${club.id}'),
-                  club: club,
-                  onTap: () => context.push('/social/clubs/${club.id}'),
-                );
-              },
             );
           },
         );

lib/features/social/clubs/create_club_screen.dart

@@ -178,17 +178,12 @@ class _CreateClubScreenState extends ConsumerState<CreateClubScreen> {
       );
     }
 
-    final mediaSize = MediaQuery.sizeOf(context);
-    final isCompactScreen = mediaSize.height < 500;
-
     return Scaffold(
       appBar: AppBar(
-        toolbarHeight: isCompactScreen ? 44 : null,
+        title: const Text(
-        title: Text(
           'Create Club',
           style: TextStyle(
             fontFamily: AppTypography.fontHeadline,
-            fontSize: isCompactScreen ? 16 : null,
             fontWeight: FontWeight.w700,
           ),
         ),
@@ -196,419 +191,332 @@ class _CreateClubScreenState extends ConsumerState<CreateClubScreen> {
       body: SafeArea(
         child: ResponsiveLayout(
           builder: (context, responsive) {
-            final isCompact =
-                responsive.isLandscape || responsive.isShortViewport;
-            final isTwoColumn =
-                responsive.isLandscape && responsive.width >= 600;
-            final bottomInset = MediaQuery.viewInsetsOf(context).bottom;
-
-            final nameField = TextFormField(
-              controller: _nameController,
-              enabled: !_isSubmitting,
-              textCapitalization: TextCapitalization.words,
-              scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
-              decoration: InputDecoration(
-                labelText: 'Club Name *',
-                hintText: 'e.g. Ridge Runners MC',
-                filled: true,
-                fillColor: colors.surfaceContainer,
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(12),
-                  borderSide: BorderSide(
-                    color: colors.outlineVariant,
-                    width: 0.8,
-                  ),
-                ),
-                enabledBorder: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(12),
-                  borderSide: BorderSide(
-                    color: colors.outlineVariant,
-                    width: 0.8,
-                  ),
-                ),
-                focusedBorder: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(12),
-                  borderSide: BorderSide(
-                    color: colors.cyberCyan,
-                    width: 1.5,
-                  ),
-                ),
-              ),
-              validator: (val) {
-                final clean = val?.trim() ?? '';
-                if (clean.length < 3) {
-                  return 'Name must be at least 3 characters';
-                }
-                if (clean.length > 50) {
-                  return 'Name cannot exceed 50 characters';
-                }
-                return null;
-              },
-            );
-
-            final slugField = SlugInputField(
-              controller: _slugController,
-              enabled: !_isSubmitting,
-              onValidationChanged: (isValid) {
-                setState(() {
-                  _isSlugValidAndAvailable = isValid;
-                });
-              },
-            );
-
-            final regionSection = Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                _buildFieldLabel(
-                  'Home base',
-                  'Where this club primarily rides or organizes from.',
-                  colors,
-                ),
-                SizedBox(height: isCompact ? 6 : 8),
-                TextFormField(
-                  controller: _regionController,
-                  enabled: !_isSubmitting,
-                  textCapitalization: TextCapitalization.words,
-                  scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
-                  decoration: InputDecoration(
-                    labelText: 'Home region (optional)',
-                    hintText: 'e.g. North Georgia, NorCal, Phoenix Metro',
-                    prefixIcon: const Icon(Icons.location_on_outlined),
-                    filled: true,
-                    fillColor: colors.surfaceContainer,
-                    border: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(12),
-                      borderSide: BorderSide(
-                        color: colors.outlineVariant,
-                        width: 0.8,
-                      ),
-                    ),
-                    enabledBorder: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(12),
-                      borderSide: BorderSide(
-                        color: colors.outlineVariant,
-                        width: 0.8,
-                      ),
-                    ),
-                  ),
-                ),
-              ],
-            );
-
-            final focusSection = Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                _buildFieldLabel(
-                  'Rider community',
-                  'Name the motorcycle types or riding style this club is for.',
-                  colors,
-                ),
-                SizedBox(height: isCompact ? 6 : 8),
-                TextFormField(
-                  controller: _focusController,
-                  enabled: !_isSubmitting,
-                  textCapitalization: TextCapitalization.words,
-                  scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
-                  decoration: InputDecoration(
-                    labelText: 'Motorcycle focus (optional)',
-                    hintText: 'e.g. Sport bikes, ADV, Cruisers, Mixed rides',
-                    prefixIcon: const Icon(Icons.two_wheeler_outlined),
-                    filled: true,
-                    fillColor: colors.surfaceContainer,
-                    border: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(12),
-                      borderSide: BorderSide(
-                        color: colors.outlineVariant,
-                        width: 0.8,
-                      ),
-                    ),
-                    enabledBorder: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(12),
-                      borderSide: BorderSide(
-                        color: colors.outlineVariant,
-                        width: 0.8,
-                      ),
-                    ),
-                  ),
-                ),
-              ],
-            );
-
-            final visibilitySection = Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  'Club Visibility',
-                  style: TextStyle(
-                    fontFamily: AppTypography.fontHeadline,
-                    fontSize: 13,
-                    fontWeight: FontWeight.w700,
-                    color: colors.cyberCyan,
-                  ),
-                ),
-                SizedBox(height: isCompact ? 6 : 8),
-                _buildVisibilitySelector(colors, theme),
-              ],
-            );
-
-            final admissionSection = Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  'Admission Policy',
-                  style: TextStyle(
-                    fontFamily: AppTypography.fontHeadline,
-                    fontSize: 13,
-                    fontWeight: FontWeight.w700,
-                    color: colors.cyberCyan,
-                  ),
-                ),
-                SizedBox(height: isCompact ? 6 : 8),
-                _buildAdmissionSelector(colors, theme),
-              ],
-            );
-
             return Center(
               child: ConstrainedBox(
-                constraints: BoxConstraints(maxWidth: isTwoColumn ? 860 : 700),
+                constraints: const BoxConstraints(maxWidth: 700),
                 child: Form(
                   key: _formKey,
-                  child: Scrollbar(
+                  child: ListView(
-                    thumbVisibility: isCompact,
+                    padding: const EdgeInsets.all(18.0),
-                    child: ListView(
+                    children: [
-                      keyboardDismissBehavior:
+                      // Header card explaining Club identity
-                          ScrollViewKeyboardDismissBehavior.onDrag,
+                      Container(
-                      padding: EdgeInsets.fromLTRB(
+                        padding: const EdgeInsets.all(14.0),
-                        isCompact ? 16.0 : 18.0,
+                        decoration: BoxDecoration(
-                        isCompact ? 10.0 : 18.0,
+                          color: colors.surfaceContainer,
-                        isCompact ? 16.0 : 18.0,
+                          borderRadius: BorderRadius.circular(12),
-                        (isCompact ? 16.0 : 32.0) +
+                          border: Border.all(
-                            (bottomInset > 0 ? 16.0 : 0.0),
+                            color: colors.outlineVariant,
-                      ),
+                            width: 0.8,
-                      children: [
+                          ),
-                        Column(
+                        ),
-                          crossAxisAlignment: CrossAxisAlignment.stretch,
+                        child: Row(
+                          crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                        // Header card explaining Club identity
+                            Icon(
+                              Icons.shield_outlined,
+                              color: colors.cyberCyan,
+                              size: 24,
+                            ),
+                            const SizedBox(width: 12),
+                            Expanded(
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  const Text(
+                                    'Found a Motorcycle Club',
+                                    style: TextStyle(
+                                      fontFamily: AppTypography.fontHeadline,
+                                      fontSize: 14,
+                                      fontWeight: FontWeight.w700,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 3),
+                                  Text(
+                                    'As the founder, you will be designated the Club Owner with administrative authority over admissions, group rides, and club settings.',
+                                    style: TextStyle(
+                                      fontFamily: AppTypography.fontBody,
+                                      fontSize: 12,
+                                      color: theme.colorScheme.onSurfaceVariant,
+                                      height: 1.3,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(height: 20),
+
+                      // Submission error alert if present
+                      if (_submissionError != null) ...[
                         Container(
-                          padding: EdgeInsets.all(isCompact ? 10.0 : 14.0),
+                          padding: const EdgeInsets.all(12),
                           decoration: BoxDecoration(
-                            color: colors.surfaceContainer,
+                            color: colors.raceRed.withValues(alpha: 0.12),
-                            borderRadius: BorderRadius.circular(12),
+                            borderRadius: BorderRadius.circular(10),
                             border: Border.all(
+                              color: colors.raceRed.withValues(alpha: 0.4),
+                            ),
+                          ),
+                          child: Row(
+                            children: [
+                              Icon(
+                                Icons.error_outline,
+                                color: colors.raceRed,
+                                size: 20,
+                              ),
+                              const SizedBox(width: 8),
+                              Expanded(
+                                child: Text(
+                                  _submissionError!,
+                                  style: TextStyle(
+                                    fontFamily: AppTypography.fontBody,
+                                    fontSize: 12.5,
+                                    color: colors.raceRed,
+                                  ),
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        const SizedBox(height: 16),
+                      ],
+
+                      // Club Name
+                      TextFormField(
+                        controller: _nameController,
+                        enabled: !_isSubmitting,
+                        textCapitalization: TextCapitalization.words,
+                        decoration: InputDecoration(
+                          labelText: 'Club Name *',
+                          hintText: 'e.g. Ridge Runners MC',
+                          filled: true,
+                          fillColor: colors.surfaceContainer,
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
                               color: colors.outlineVariant,
                               width: 0.8,
                             ),
                           ),
-                          child: Row(
+                          enabledBorder: OutlineInputBorder(
-                            crossAxisAlignment: CrossAxisAlignment.start,
+                            borderRadius: BorderRadius.circular(12),
-                            children: [
+                            borderSide: BorderSide(
-                              Icon(
+                              color: colors.outlineVariant,
-                                Icons.shield_outlined,
+                              width: 0.8,
-                                color: colors.cyberCyan,
+                            ),
-                                size: isCompact ? 20 : 24,
+                          ),
-                              ),
+                          focusedBorder: OutlineInputBorder(
-                              const SizedBox(width: 12),
+                            borderRadius: BorderRadius.circular(12),
-                              Expanded(
+                            borderSide: BorderSide(
-                                child: Column(
+                              color: colors.cyberCyan,
-                                  crossAxisAlignment: CrossAxisAlignment.start,
+                              width: 1.5,
-                                  children: [
+                            ),
-                                    const Text(
-                                      'Found a Motorcycle Club',
-                                      style: TextStyle(
-                                        fontFamily: AppTypography.fontHeadline,
-                                        fontSize: 14,
-                                        fontWeight: FontWeight.w700,
-                                      ),
-                                    ),
-                                    const SizedBox(height: 3),
-                                    Text(
-                                      'As the founder, you will be designated the Club Owner with administrative authority over admissions, group rides, and club settings.',
-                                      style: TextStyle(
-                                        fontFamily: AppTypography.fontBody,
-                                        fontSize: 12,
-                                        color:
-                                            theme.colorScheme.onSurfaceVariant,
-                                        height: 1.3,
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                            ],
                           ),
                         ),
-                        SizedBox(height: isCompact ? 12 : 20),
+                        validator: (val) {
+                          final clean = val?.trim() ?? '';
+                          if (clean.length < 3) {
+                            return 'Name must be at least 3 characters';
+                          }
+                          if (clean.length > 50) {
+                            return 'Name cannot exceed 50 characters';
+                          }
+                          return null;
+                        },
+                      ),
+                      const SizedBox(height: 18),
 
-                        // Submission error alert if present
+                      // Slug / Handle with live debounce & availability checking
-                        if (_submissionError != null) ...[
+                      SlugInputField(
-                          Container(
+                        controller: _slugController,
-                            padding: const EdgeInsets.all(12),
+                        enabled: !_isSubmitting,
-                            decoration: BoxDecoration(
+                        onValidationChanged: (isValid) {
-                              color: colors.raceRed.withValues(alpha: 0.12),
+                          setState(() {
-                              borderRadius: BorderRadius.circular(10),
+                            _isSlugValidAndAvailable = isValid;
-                              border: Border.all(
+                          });
-                                color: colors.raceRed.withValues(alpha: 0.4),
+                        },
-                              ),
+                      ),
+                      const SizedBox(height: 18),
+
+                      // Description
+                      TextFormField(
+                        controller: _descController,
+                        enabled: !_isSubmitting,
+                        maxLines: 3,
+                        maxLength: 500,
+                        textCapitalization: TextCapitalization.sentences,
+                        decoration: InputDecoration(
+                          labelText: 'Description (Optional)',
+                          hintText:
+                              'Share your club mission, riding style, or club guidelines...',
+                          filled: true,
+                          fillColor: colors.surfaceContainer,
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: colors.outlineVariant,
+                              width: 0.8,
                             ),
-                            child: Row(
+                          ),
-                              children: [
+                          enabledBorder: OutlineInputBorder(
-                                Icon(
+                            borderRadius: BorderRadius.circular(12),
-                                  Icons.error_outline,
+                            borderSide: BorderSide(
-                                  color: colors.raceRed,
+                              color: colors.outlineVariant,
-                                  size: 20,
+                              width: 0.8,
-                                ),
+                            ),
-                                const SizedBox(width: 8),
+                          ),
-                                Expanded(
+                          focusedBorder: OutlineInputBorder(
-                                  child: Text(
+                            borderRadius: BorderRadius.circular(12),
-                                    _submissionError!,
+                            borderSide: BorderSide(
-                                    style: TextStyle(
+                              color: colors.cyberCyan,
-                                      fontFamily: AppTypography.fontBody,
+                              width: 1.5,
-                                      fontSize: 12.5,
+                            ),
-                                      color: colors.raceRed,
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 14),
+
+                      // Give optional discovery fields enough room for a clear
+                      // label and example on narrow phone layouts.
+                      _buildFieldLabel(
+                        'Home base',
+                        'Where this club primarily rides or organizes from.',
+                        colors,
+                      ),
+                      const SizedBox(height: 8),
+                      TextFormField(
+                        controller: _regionController,
+                        enabled: !_isSubmitting,
+                        textCapitalization: TextCapitalization.words,
+                        decoration: InputDecoration(
+                          labelText: 'Home region (optional)',
+                          hintText: 'e.g. North Georgia, NorCal, Phoenix Metro',
+                          prefixIcon: const Icon(Icons.location_on_outlined),
+                          filled: true,
+                          fillColor: colors.surfaceContainer,
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: colors.outlineVariant,
+                              width: 0.8,
+                            ),
+                          ),
+                          enabledBorder: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: colors.outlineVariant,
+                              width: 0.8,
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 18),
+                      _buildFieldLabel(
+                        'Rider community',
+                        'Name the motorcycle types or riding style this club is for.',
+                        colors,
+                      ),
+                      const SizedBox(height: 8),
+                      TextFormField(
+                        controller: _focusController,
+                        enabled: !_isSubmitting,
+                        textCapitalization: TextCapitalization.words,
+                        decoration: InputDecoration(
+                          labelText: 'Motorcycle focus (optional)',
+                          hintText:
+                              'e.g. Sport bikes, ADV, Cruisers, Mixed rides',
+                          prefixIcon: const Icon(Icons.two_wheeler_outlined),
+                          filled: true,
+                          fillColor: colors.surfaceContainer,
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: colors.outlineVariant,
+                              width: 0.8,
+                            ),
+                          ),
+                          enabledBorder: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(12),
+                            borderSide: BorderSide(
+                              color: colors.outlineVariant,
+                              width: 0.8,
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 24),
+
+                      // Visibility Selection
+                      Text(
+                        'Club Visibility',
+                        style: TextStyle(
+                          fontFamily: AppTypography.fontHeadline,
+                          fontSize: 13,
+                          fontWeight: FontWeight.w700,
+                          color: colors.cyberCyan,
+                        ),
+                      ),
+                      const SizedBox(height: 8),
+                      _buildVisibilitySelector(colors, theme),
+                      const SizedBox(height: 20),
+
+                      // Admission Policy Selection
+                      Text(
+                        'Admission Policy',
+                        style: TextStyle(
+                          fontFamily: AppTypography.fontHeadline,
+                          fontSize: 13,
+                          fontWeight: FontWeight.w700,
+                          color: colors.cyberCyan,
+                        ),
+                      ),
+                      const SizedBox(height: 8),
+                      _buildAdmissionSelector(colors, theme),
+                      const SizedBox(height: 32),
+
+                      // Submit Button
+                      SizedBox(
+                        height: 50,
+                        child: FilledButton(
+                          key: const ValueKey('create_club_submit_button'),
+                          onPressed:
+                              (_isSubmitting || !_isSlugValidAndAvailable)
+                              ? null
+                              : _submitForm,
+                          style: FilledButton.styleFrom(
+                            backgroundColor: colors.cyberCyan,
+                            foregroundColor: Colors.black,
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(12),
+                            ),
+                          ),
+                          child: _isSubmitting
+                              ? const SizedBox(
+                                  width: 24,
+                                  height: 24,
+                                  child: CircularProgressIndicator(
+                                    strokeWidth: 2.5,
+                                    valueColor: AlwaysStoppedAnimation<Color>(
+                                      Colors.black,
                                     ),
                                   ),
-                                ),
+                                )
-                              ],
+                              : const Text(
-                            ),
+                                  'Create Club',
-                          ),
+                                  style: TextStyle(
-                          SizedBox(height: isCompact ? 12 : 16),
+                                    fontFamily: AppTypography.fontHeadline,
-                        ],
+                                    fontSize: 15,
-
+                                    fontWeight: FontWeight.w800,
-                        // Club Name & Slug / Handle
+                                    letterSpacing: 0.3,
-                        if (isTwoColumn)
-                          Row(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Expanded(child: nameField),
-                              const SizedBox(width: 16),
-                              Expanded(child: slugField),
-                            ],
-                          )
-                        else ...[
-                          nameField,
-                          const SizedBox(height: 18),
-                          slugField,
-                        ],
-                        SizedBox(height: isCompact ? 12 : 18),
-
-                        // Description
-                        TextFormField(
-                          controller: _descController,
-                          enabled: !_isSubmitting,
-                          maxLines: isCompact ? 2 : 3,
-                          maxLength: 500,
-                          textCapitalization: TextCapitalization.sentences,
-                          scrollPadding:
-                              const EdgeInsets.only(bottom: 120, top: 24),
-                          decoration: InputDecoration(
-                            labelText: 'Description (Optional)',
-                            hintText:
-                                'Share your club mission, riding style, or club guidelines...',
-                            filled: true,
-                            fillColor: colors.surfaceContainer,
-                            border: OutlineInputBorder(
-                              borderRadius: BorderRadius.circular(12),
-                              borderSide: BorderSide(
-                                color: colors.outlineVariant,
-                                width: 0.8,
-                              ),
-                            ),
-                            enabledBorder: OutlineInputBorder(
-                              borderRadius: BorderRadius.circular(12),
-                              borderSide: BorderSide(
-                                color: colors.outlineVariant,
-                                width: 0.8,
-                              ),
-                            ),
-                            focusedBorder: OutlineInputBorder(
-                              borderRadius: BorderRadius.circular(12),
-                              borderSide: BorderSide(
-                                color: colors.cyberCyan,
-                                width: 1.5,
-                              ),
-                            ),
-                          ),
-                        ),
-                        SizedBox(height: isCompact ? 10 : 14),
-
-                        // Home base & Rider community
-                        if (isTwoColumn)
-                          Row(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Expanded(child: regionSection),
-                              const SizedBox(width: 16),
-                              Expanded(child: focusSection),
-                            ],
-                          )
-                        else ...[
-                          regionSection,
-                          const SizedBox(height: 18),
-                          focusSection,
-                        ],
-                        SizedBox(height: isCompact ? 14 : 24),
-
-                        // Visibility & Admission Policy Selection
-                        if (isTwoColumn)
-                          Row(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Expanded(child: visibilitySection),
-                              const SizedBox(width: 16),
-                              Expanded(child: admissionSection),
-                            ],
-                          )
-                        else ...[
-                          visibilitySection,
-                          const SizedBox(height: 20),
-                          admissionSection,
-                        ],
-                        SizedBox(height: isCompact ? 16 : 32),
-
-                        // Submit Button
-                        SizedBox(
-                          height: isCompact ? 46 : 50,
-                          child: FilledButton(
-                            key: const ValueKey('create_club_submit_button'),
-                            onPressed:
-                                (_isSubmitting || !_isSlugValidAndAvailable)
-                                ? null
-                                : _submitForm,
-                            style: FilledButton.styleFrom(
-                              backgroundColor: colors.cyberCyan,
-                              foregroundColor: Colors.black,
-                              shape: RoundedRectangleBorder(
-                                borderRadius: BorderRadius.circular(12),
-                              ),
-                            ),
-                            child: _isSubmitting
-                                ? const SizedBox(
-                                    width: 24,
-                                    height: 24,
-                                    child: CircularProgressIndicator(
-                                      strokeWidth: 2.5,
-                                      valueColor: AlwaysStoppedAnimation<Color>(
-                                        Colors.black,
-                                      ),
-                                    ),
-                                  )
-                                : const Text(
-                                    'Create Club',
-                                    style: TextStyle(
-                                      fontFamily: AppTypography.fontHeadline,
-                                      fontSize: 15,
-                                      fontWeight: FontWeight.w800,
-                                      letterSpacing: 0.3,
-                                    ),
                                   ),
-                          ),
+                                ),
                         ),
-                        SizedBox(height: isCompact ? 12 : 32),
+                      ),
-                          ],
+                      const SizedBox(height: 32),
-                        ),
+                    ],
-                      ],
-                    ),
                   ),
                 ),
               ),
@@ -625,19 +533,12 @@ class _CreateClubScreenState extends ConsumerState<CreateClubScreen> {
   ) {
     return DropdownButtonFormField<ClubVisibility>(
       initialValue: _visibility,
-      isExpanded: true,
       decoration: _choiceDecoration('Who can find this club', colors),
       dropdownColor: colors.surfaceContainerHigh,
-      style: TextStyle(color: theme.colorScheme.onSurface),
+      style: const TextStyle(color: Colors.white),
       items: ClubVisibility.values
           .map(
-            (value) => DropdownMenuItem(
+            (value) => DropdownMenuItem(value: value, child: Text(value.label)),
-              value: value,
-              child: Text(
-                value.label,
-                overflow: TextOverflow.ellipsis,
-              ),
-            ),
           )
           .toList(),
       onChanged: _isSubmitting
@@ -654,19 +555,12 @@ class _CreateClubScreenState extends ConsumerState<CreateClubScreen> {
   ) {
     return DropdownButtonFormField<ClubAdmissionPolicy>(
       initialValue: _admissionPolicy,
-      isExpanded: true,
       decoration: _choiceDecoration('How riders join', colors),
       dropdownColor: colors.surfaceContainerHigh,
-      style: TextStyle(color: theme.colorScheme.onSurface),
+      style: const TextStyle(color: Colors.white),
       items: ClubAdmissionPolicy.values
           .map(
-            (value) => DropdownMenuItem(
+            (value) => DropdownMenuItem(value: value, child: Text(value.label)),
-              value: value,
-              child: Text(
-                value.label,
-                overflow: TextOverflow.ellipsis,
-              ),
-            ),
           )
           .toList(),
       onChanged: _isSubmitting

lib/features/social/clubs/widgets/club_card.dart

@@ -10,14 +10,12 @@ class ClubCard extends StatelessWidget {
   final Club club;
   final ClubRole? role;
   final VoidCallback? onTap;
-  final bool inGrid;
 
   const ClubCard({
     super.key,
     required this.club,
     this.role,
     this.onTap,
-    this.inGrid = false,
   });
 
   @override
@@ -26,7 +24,7 @@ class ClubCard extends StatelessWidget {
     final theme = Theme.of(context);
 
     return Container(
-      margin: inGrid ? EdgeInsets.zero : const EdgeInsets.symmetric(vertical: 6.0),
+      margin: const EdgeInsets.symmetric(vertical: 6.0),
       decoration: BoxDecoration(
         color: colors.surfaceContainer,
         borderRadius: BorderRadius.circular(14),
@@ -129,8 +127,7 @@ class ClubCard extends StatelessWidget {
                     ),
 
                     // Admission policy badge
-                    if (role == null)
+                    _buildAdmissionBadge(context, club.admissionPolicy, colors),
-                      _buildAdmissionBadge(context, club.admissionPolicy, colors),
 
                     // Region badge if available
                     if (club.homeRegion != null && club.homeRegion!.trim().isNotEmpty)
@@ -218,7 +215,7 @@ class ClubCard extends StatelessWidget {
     switch (policy) {
       case ClubAdmissionPolicy.open:
         color = colors.launchGreen;
-        icon = Icons.group_add_outlined;
+        icon = Icons.lock_open_outlined;
         break;
       case ClubAdmissionPolicy.request:
         color = colors.cyberCyan;

lib/features/social/clubs/widgets/club_member_card.dart

@@ -10,12 +10,10 @@ import 'club_card.dart';
 /// Club document in real time.
 class ClubMemberCard extends ConsumerWidget {
   final ClubMember member;
-  final bool inGrid;
 
   const ClubMemberCard({
     super.key,
     required this.member,
-    this.inGrid = false,
   });
 
   @override
@@ -30,7 +28,6 @@ class ClubMemberCard extends ConsumerWidget {
         return ClubCard(
           club: club,
           role: member.role,
-          inGrid: inGrid,
           onTap: () => context.push('/social/clubs/${club.id}'),
         );
       },
@@ -43,7 +40,7 @@ class ClubMemberCard extends ConsumerWidget {
     final colors = context.motorColors;
 
     return Container(
-      margin: inGrid ? EdgeInsets.zero : const EdgeInsets.symmetric(vertical: 6.0),
+      margin: const EdgeInsets.symmetric(vertical: 6.0),
       height: 96,
       decoration: BoxDecoration(
         color: colors.surfaceContainer,

lib/features/social/clubs/widgets/slug_input_field.dart

@@ -151,7 +151,6 @@ class _SlugInputFieldState extends ConsumerState<SlugInputField> {
           enableSuggestions: false,
           keyboardType: TextInputType.text,
           textCapitalization: TextCapitalization.none,
-          scrollPadding: const EdgeInsets.only(bottom: 120, top: 24),
           inputFormatters: [
             FilteringTextInputFormatter.allow(RegExp(r'[a-zA-Z0-9-]')),
             _LowerCaseTextFormatter(),

lib/features/social/feed/social_feed_screen.dart

@@ -53,10 +53,6 @@ class _SocialFeedScreenState extends ConsumerState<SocialFeedScreen> {
     final activeDiscipline = ref.watch(feedDisciplineFilterProvider);
     final searchQuery = ref.watch(feedSearchQueryProvider);
     final items = ref.watch(socialFeedNotifierProvider);
-    final safeBottom = MediaQuery.paddingOf(context).bottom;
-    const buttonHeight = 52.0;
-    const buttonBottom = 12.0;
-    final bottomClearance = buttonHeight + buttonBottom + 16.0 + safeBottom;
 
     final content = SafeArea(
       child: ResponsiveLayout(
@@ -87,16 +83,10 @@ class _SocialFeedScreenState extends ConsumerState<SocialFeedScreen> {
                                 activeDiscipline,
                                 searchQuery,
                                 colors,
-                                bottomClearance: bottomClearance,
                               )
                             : ListView.separated(
                                 key: const ValueKey('social_feed_list_view'),
-                                padding: EdgeInsets.fromLTRB(
+                                padding: const EdgeInsets.fromLTRB(16, 10, 16, 100),
-                                  16,
-                                  10,
-                                  16,
-                                  bottomClearance + 20.0,
-                                ),
                                 itemCount: items.length,
                                 separatorBuilder: (_, _) => const SizedBox(height: 16),
                                 itemBuilder: (context, index) {
@@ -116,7 +106,7 @@ class _SocialFeedScreenState extends ConsumerState<SocialFeedScreen> {
               Positioned(
                 left: 16,
                 right: 16,
-                bottom: 12 + safeBottom,
+                bottom: 12,
                 child: Center(
                   child: ConstrainedBox(
                     constraints: const BoxConstraints(maxWidth: 720),
@@ -607,9 +597,8 @@ class _SocialFeedScreenState extends ConsumerState<SocialFeedScreen> {
     FeedFilter activeFilter,
     RidingDiscipline activeDiscipline,
     String searchQuery,
-    MotorSignalThemeColors colors, {
+    MotorSignalThemeColors colors,
-    double bottomClearance = 88.0,
+  ) {
-  }) {
     final hasCustomFilters =
         activeDiscipline != RidingDiscipline.all || searchQuery.isNotEmpty;
     final isLight = Theme.of(context).brightness == Brightness.light;
@@ -622,56 +611,51 @@ class _SocialFeedScreenState extends ConsumerState<SocialFeedScreen> {
 
     return LayoutBuilder(
       builder: (context, constraints) {
-        final isCompact = constraints.maxHeight < 280;
-        final iconSize = isCompact ? 36.0 : 56.0;
-        final verticalGap = isCompact ? 8.0 : 16.0;
-        final textGap = isCompact ? 4.0 : 6.0;
-
         return SingleChildScrollView(
           physics: const ClampingScrollPhysics(),
-          padding: EdgeInsets.only(bottom: bottomClearance),
+          padding: const EdgeInsets.only(bottom: 80),
           child: ConstrainedBox(
             constraints: BoxConstraints(
-              minHeight: constraints.maxHeight > bottomClearance
+              minHeight: constraints.maxHeight > 80
-                  ? constraints.maxHeight - bottomClearance
+                  ? constraints.maxHeight - 80
                   : constraints.maxHeight,
             ),
             child: Center(
               child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 8),
+                padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
                     Icon(
                       Icons.dynamic_feed_outlined,
-                      size: iconSize,
+                      size: 56,
                       color: secondaryTextColor,
                     ),
-                    SizedBox(height: verticalGap),
+            const SizedBox(height: 16),
-                    Text(
+            Text(
-                      hasCustomFilters
+              hasCustomFilters
-                          ? 'No matching ride sessions'
+                  ? 'No matching ride sessions'
-                          : 'No posts in ${activeFilter.displayName}',
+                  : 'No posts in ${activeFilter.displayName}',
-                      style: TextStyle(
+              style: TextStyle(
-                        fontFamily: AppTypography.fontHeadline,
+                fontFamily: AppTypography.fontHeadline,
-                        fontSize: isCompact ? 14 : 16,
+                fontSize: 16,
-                        fontWeight: FontWeight.w700,
+                fontWeight: FontWeight.w700,
-                        color: primaryTextColor,
+                color: primaryTextColor,
-                      ),
+              ),
-                    ),
+            ),
-                    SizedBox(height: textGap),
+            const SizedBox(height: 6),
-                    Text(
+            Text(
-                      hasCustomFilters
+              hasCustomFilters
-                          ? 'Try relaxing your style filters or search query to discover more community rides.'
+                  ? 'Try relaxing your style filters or search query to discover more community rides.'
-                          : 'Hit "Share Recent Session" below to publish telemetry, or check out group rides and clubs.',
+                  : 'Hit "Share Recent Session" below to publish telemetry, or check out group rides and clubs.',
-                      textAlign: TextAlign.center,
+              textAlign: TextAlign.center,
-                      style: TextStyle(
+              style: TextStyle(
-                        fontFamily: AppTypography.fontBody,
+                fontFamily: AppTypography.fontBody,
-                        fontSize: isCompact ? 12 : 13,
+                fontSize: 13,
-                        color: secondaryTextColor,
+                color: secondaryTextColor,
-                      ),
+              ),
-                    ),
+            ),
-                    SizedBox(height: verticalGap),
+            const SizedBox(height: 16),
             Wrap(
               spacing: 8,
               runSpacing: 8,

lib/features/social/feed/widgets/share_session_modal.dart

@@ -413,13 +413,11 @@ class _ShareSessionModalState extends ConsumerState<ShareSessionModal> {
     final accentColor =
         isLight ? AppColors.brandBlueStrong : AppColors.brandBlue;
     final buttonFg = AppColors.onBrand;
-    final size = MediaQuery.sizeOf(context);
+    final bottomInset = MediaQuery.of(context).viewInsets.bottom;
-    final isLandscape = size.width > size.height && size.height <= 500;
-    final bottomInset = MediaQuery.viewInsetsOf(context).bottom;
 
     return ConstrainedBox(
       constraints: BoxConstraints(
-        maxHeight: size.height * (isLandscape ? 0.98 : 0.9),
+        maxHeight: MediaQuery.of(context).size.height * 0.9,
       ),
       child: Container(
         decoration: BoxDecoration(
@@ -444,19 +442,14 @@ class _ShareSessionModalState extends ConsumerState<ShareSessionModal> {
               children: [
                 // Modal Header & Handle
                 Padding(
-                  padding: EdgeInsets.fromLTRB(
+                  padding: const EdgeInsets.fromLTRB(20, 12, 20, 12),
-                    20,
-                    isLandscape ? 8 : 12,
-                    20,
-                    isLandscape ? 8 : 12,
-                  ),
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
                     children: [
                       // Drag handle
                       Center(
                         child: Container(
-                          margin: EdgeInsets.only(bottom: isLandscape ? 6 : 12),
+                          margin: const EdgeInsets.only(bottom: 12),
                           width: 44,
                           height: 4,
                           decoration: BoxDecoration(
@@ -770,22 +763,59 @@ class _ShareSessionModalState extends ConsumerState<ShareSessionModal> {
                     ),
                   ],
                 ),
-                if (isLandscape) ...[
-                  const SizedBox(height: 18),
-                  _buildPublishButton(accentColor, buttonFg),
-                  const SizedBox(height: 8),
-                ],
               ],
             ),
           ),
         ),
 
-        // Publish CTA Button (pinned at modal bottom in portrait mode)
+        // Publish CTA Button (pinned at modal bottom)
-        if (!isLandscape)
+        Padding(
-          Padding(
+          padding: const EdgeInsets.fromLTRB(20, 8, 20, 16),
-            padding: const EdgeInsets.fromLTRB(20, 8, 20, 16),
+          child: SizedBox(
-            child: _buildPublishButton(accentColor, buttonFg),
+            height: 52,
+            width: double.infinity,
+            child: ElevatedButton(
+              style: ElevatedButton.styleFrom(
+                backgroundColor: accentColor,
+                foregroundColor: buttonFg,
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                elevation: 4,
+              ),
+              onPressed:
+                  (_isSubmitting || _selectedRide == null) ? null : _handlePublish,
+              child: _isSubmitting
+                  ? SizedBox(
+                      width: 22,
+                      height: 22,
+                      child: CircularProgressIndicator(
+                        strokeWidth: 2.5,
+                        color: buttonFg,
+                      ),
+                    )
+                  : Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: const [
+                        Icon(Icons.share_rounded, size: 20),
+                        SizedBox(width: 8),
+                        Flexible(
+                          child: Text(
+                            'PUBLISH TO COMMUNITY FEED',
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                              fontFamily: AppTypography.fontHeadline,
+                              fontSize: 13,
+                              fontWeight: FontWeight.w700,
+                              letterSpacing: 0.5,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+            ),
           ),
+        ),
       ],
     ),
   ),
@@ -794,53 +824,6 @@ class _ShareSessionModalState extends ConsumerState<ShareSessionModal> {
 );
 }
 
-  Widget _buildPublishButton(Color accentColor, Color buttonFg) {
-    return SizedBox(
-      height: 52,
-      width: double.infinity,
-      child: ElevatedButton(
-        style: ElevatedButton.styleFrom(
-          backgroundColor: accentColor,
-          foregroundColor: buttonFg,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(12),
-          ),
-          elevation: 4,
-        ),
-        onPressed:
-            (_isSubmitting || _selectedRide == null) ? null : _handlePublish,
-        child: _isSubmitting
-            ? SizedBox(
-                width: 22,
-                height: 22,
-                child: CircularProgressIndicator(
-                  strokeWidth: 2.5,
-                  color: buttonFg,
-                ),
-              )
-            : Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: const [
-                  Icon(Icons.share_rounded, size: 20),
-                  SizedBox(width: 8),
-                  Flexible(
-                    child: Text(
-                      'PUBLISH TO COMMUNITY FEED',
-                      overflow: TextOverflow.ellipsis,
-                      style: TextStyle(
-                        fontFamily: AppTypography.fontHeadline,
-                        fontSize: 13,
-                        fontWeight: FontWeight.w700,
-                        letterSpacing: 0.5,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-      ),
-    );
-  }
-
   Widget _buildReadOnlyTelemetryTile({
     required Key key,
     required String label,

lib/services/alerts/widgets/quick_swarm_report_modal.dart

@@ -152,13 +152,7 @@ class _QuickSwarmReportModalState extends ConsumerState<QuickSwarmReportModal> {
 
   @override
   Widget build(BuildContext context) {
-    final size = MediaQuery.sizeOf(context);
+    final maxHeight = MediaQuery.of(context).size.height * 0.85;
-    final insets = MediaQuery.viewInsetsOf(context);
-    final isLandscape = size.width > size.height;
-    final maxHeight = (size.height - insets.bottom) * (isLandscape ? 0.95 : 0.85);
-    final crossAxisCount = size.width >= 720
-        ? 4
-        : (size.width >= 480 ? 3 : 2);
 
     return Container(
       constraints: BoxConstraints(maxHeight: maxHeight),
@@ -171,12 +165,7 @@ class _QuickSwarmReportModalState extends ConsumerState<QuickSwarmReportModal> {
       ),
       child: SafeArea(
         child: Padding(
-          padding: EdgeInsets.fromLTRB(
+          padding: const EdgeInsets.fromLTRB(16, 12, 16, 16),
-            16,
-            isLandscape ? 8 : 12,
-            16,
-            isLandscape ? 8 : 16,
-          ),
           child: Column(
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -191,17 +180,17 @@ class _QuickSwarmReportModalState extends ConsumerState<QuickSwarmReportModal> {
                   ),
                 ),
               ),
-              SizedBox(height: isLandscape ? 6 : 12),
+              const SizedBox(height: 12),
               Row(
                 children: [
-                  Icon(Icons.campaign, color: AppColors.cyberCyan, size: isLandscape ? 20 : 24),
+                  const Icon(Icons.campaign, color: AppColors.cyberCyan, size: 24),
                   const SizedBox(width: 10),
                   Expanded(
                     child: Text(
                       'REPORT ROAD INCIDENT',
                       style: TextStyle(
                         fontFamily: AppTypography.fontHeadline,
-                        fontSize: isLandscape ? 14 : 16,
+                        fontSize: 16,
                         fontWeight: FontWeight.bold,
                         letterSpacing: 0.8,
                         color: Colors.white,
@@ -210,27 +199,23 @@ class _QuickSwarmReportModalState extends ConsumerState<QuickSwarmReportModal> {
                   ),
                   IconButton(
                     icon: const Icon(Icons.close, color: Colors.white60),
-                    padding: isLandscape ? EdgeInsets.zero : const EdgeInsets.all(8.0),
-                    constraints: isLandscape ? const BoxConstraints() : null,
                     onPressed: () => Navigator.of(context).pop(),
                   ),
                 ],
               ),
-              if (!isLandscape) ...[
+              const SizedBox(height: 4),
-                const SizedBox(height: 4),
+              Text(
-                Text(
+                '1-tap broadcast to all nearby riders & pack members.',
-                  '1-tap broadcast to all nearby riders & pack members.',
+                style: TextStyle(
-                  style: TextStyle(
+                  fontFamily: AppTypography.fontBody,
-                    fontFamily: AppTypography.fontBody,
+                  fontSize: 12,
-                    fontSize: 12,
+                  color: Colors.white70,
-                    color: Colors.white70,
-                  ),
                 ),
-              ],
+              ),
               if (_isMovingFast) ...[
-                SizedBox(height: isLandscape ? 6 : 10),
+                const SizedBox(height: 10),
                 Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+                  padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
                   decoration: BoxDecoration(
                     color: Colors.amber.withValues(alpha: 0.15),
                     borderRadius: BorderRadius.circular(8),
@@ -238,7 +223,7 @@ class _QuickSwarmReportModalState extends ConsumerState<QuickSwarmReportModal> {
                   ),
                   child: const Row(
                     children: [
-                      Icon(Icons.warning_amber_rounded, color: Colors.amber, size: 16),
+                      Icon(Icons.warning_amber_rounded, color: Colors.amber, size: 18),
                       SizedBox(width: 8),
                       Expanded(
                         child: Text(
@@ -254,23 +239,22 @@ class _QuickSwarmReportModalState extends ConsumerState<QuickSwarmReportModal> {
                   ),
                 ),
               ],
-              SizedBox(height: isLandscape ? 8 : 14),
+              const SizedBox(height: 14),
               Flexible(
                 child: SingleChildScrollView(
-                  physics: const ClampingScrollPhysics(),
                   child: GridView.builder(
                     shrinkWrap: true,
                     physics: const NeverScrollableScrollPhysics(),
                     itemCount: _kReportCategories.length,
-                    gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                    gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                      crossAxisCount: crossAxisCount,
+                      crossAxisCount: 2,
-                      mainAxisExtent: isLandscape ? 56.0 : 70.0,
+                      childAspectRatio: 2.2,
-                      crossAxisSpacing: 8,
+                      crossAxisSpacing: 10,
-                      mainAxisSpacing: 8,
+                      mainAxisSpacing: 10,
                     ),
                     itemBuilder: (context, index) {
                       final item = _kReportCategories[index];
-                      return _buildGridCard(item, isLandscape: isLandscape);
+                      return _buildGridCard(item);
                     },
                   ),
                 ),
@@ -282,17 +266,14 @@ class _QuickSwarmReportModalState extends ConsumerState<QuickSwarmReportModal> {
     );
   }
 
-  Widget _buildGridCard(_ReportItem item, {bool isLandscape = false}) {
+  Widget _buildGridCard(_ReportItem item) {
     return ElevatedButton(
       style: ElevatedButton.styleFrom(
         backgroundColor: item.color.withValues(alpha: 0.12),
         foregroundColor: Colors.white,
-        padding: EdgeInsets.symmetric(
+        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
-          horizontal: isLandscape ? 6 : 10,
-          vertical: isLandscape ? 4 : 8,
-        ),
         shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(10),
+          borderRadius: BorderRadius.circular(12),
           side: BorderSide(color: item.color.withValues(alpha: 0.7), width: 1.5),
         ),
         elevation: 0,
@@ -301,14 +282,14 @@ class _QuickSwarmReportModalState extends ConsumerState<QuickSwarmReportModal> {
       child: Row(
         children: [
           Container(
-            padding: EdgeInsets.all(isLandscape ? 5 : 7),
+            padding: const EdgeInsets.all(7),
             decoration: BoxDecoration(
               color: item.color.withValues(alpha: 0.22),
               borderRadius: BorderRadius.circular(8),
             ),
-            child: Icon(item.icon, color: item.color, size: isLandscape ? 18 : 22),
+            child: Icon(item.icon, color: item.color, size: 22),
           ),
-          SizedBox(width: isLandscape ? 6 : 8),
+          const SizedBox(width: 8),
           Expanded(
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -318,22 +299,20 @@ class _QuickSwarmReportModalState extends ConsumerState<QuickSwarmReportModal> {
                   item.title,
                   style: TextStyle(
                     fontFamily: AppTypography.fontHeadline,
-                    fontSize: isLandscape ? 11.5 : 13,
+                    fontSize: 13,
                     fontWeight: FontWeight.bold,
                     color: Colors.white,
                   ),
                   maxLines: 1,
                   overflow: TextOverflow.ellipsis,
                 ),
-                if (!isLandscape) ...[
+                const SizedBox(height: 2),
-                  const SizedBox(height: 2),
+                Text(
-                  Text(
+                  item.subtitle,
-                    item.subtitle,
+                  style: const TextStyle(fontSize: 10, color: Colors.white70),
-                    style: const TextStyle(fontSize: 10, color: Colors.white70),
+                  maxLines: 1,
-                    maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
-                    overflow: TextOverflow.ellipsis,
+                ),
-                  ),
-                ],
               ],
             ),
           ),

lib/services/routes/route_providers.dart

@@ -1,5 +1,4 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:geolocator/geolocator.dart';
 import '../auth/auth_providers.dart';
 import '../map/map_provider_interface.dart';
 import 'aws_location_route_provider.dart';
@@ -8,19 +7,6 @@ import 'route_models.dart';
 import 'route_provider.dart';
 import 'route_service.dart';
 
-/// One cached location read per planner visit; never starts GPS or asks permission.
-final routePlannerLocationProvider = FutureProvider.autoDispose<AppLatLng?>((ref) async {
-  try {
-    final position = await Geolocator.getLastKnownPosition();
-    if (position == null || !RoutePlannerNotifier.isValidCoordinate(position.latitude, position.longitude)) {
-      return null;
-    }
-    return AppLatLng(position.latitude, position.longitude);
-  } catch (_) {
-    return null;
-  }
-});
-
 /// Provider for RouteService.
 final routeServiceProvider = Provider<RouteService>((ref) {
   return RouteService();

test/canonical_group_rides_social_responsive_test.dart

@@ -20,7 +20,6 @@ import 'package:motorcycle_dash/services/social/rider_profile_models.dart';
 import 'package:motorcycle_dash/services/social/social_providers.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:motorcycle_dash/features/records/records_service.dart';
-import 'package:motorcycle_dash/services/routes/route_providers.dart';
 
 class _FakeAuth implements AuthService {
   @override Future<void> ensureBackendIdentity() async {}
@@ -404,106 +403,6 @@ void main() {
         expect(tester.takeException(), isNull);
       });
     }
-
-    testWidgets(
-        'Attach Saved Route sheet empty state does not overflow in landscape (800x360) with keyboard inset and portrait (#75)',
-        (tester) async {
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-      addTearDown(tester.view.resetViewInsets);
-
-      final fakeAuth = _FakeAuth(user: testUser);
-
-      for (final viewportSize in const [
-        Size(800, 360),
-        Size(640, 320),
-        Size(400, 800),
-      ]) {
-        final isLandscape = viewportSize.width > viewportSize.height;
-        tester.view.physicalSize = viewportSize;
-        tester.view.devicePixelRatio = 1.0;
-        tester.view.resetViewInsets();
-
-        await tester.pumpWidget(
-          ProviderScope(
-            overrides: [
-              sharedPreferencesProvider.overrideWithValue(prefs),
-              authServiceProvider.overrideWithValue(fakeAuth),
-              currentUserProvider.overrideWithValue(testUser),
-              groupRideStreamProvider('ride_101').overrideWith(
-                (ref) => Stream.value(testRide),
-              ),
-              groupRideParticipantsProvider('ride_101').overrideWith(
-                (ref) => Stream.value(testParticipants),
-              ),
-              groupRideLivePresenceProvider('ride_101').overrideWith(
-                (ref) => Stream.value(testPresences),
-              ),
-              myRiderProfileProvider.overrideWith(
-                (ref) => Stream.value(testProfile),
-              ),
-              userRoutesProvider('uid_lead').overrideWith(
-                (ref) => Stream.value(const []),
-              ),
-            ],
-            child: MaterialApp(
-              theme: AppTheme.darkTheme,
-              home: const GroupRideDetailScreen(rideId: 'ride_101'),
-            ),
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        final attachBtn =
-            find.byKey(const ValueKey('attach_saved_route_button'));
-        await tester.scrollUntilVisible(
-          attachBtn,
-          150.0,
-          scrollable: find.byType(Scrollable).first,
-        );
-        await tester.pumpAndSettle();
-        await tester.tap(attachBtn);
-        await tester.pump();
-        expect(tester.takeException(), isNull);
-        await tester.pump(const Duration(milliseconds: 300));
-        expect(tester.takeException(), isNull);
-
-        expect(find.text('ATTACH SAVED ROUTE'), findsWidgets);
-        expect(find.text('You have no saved routes yet.'), findsOneWidget);
-        expect(find.text('CREATE A ROUTE'), findsOneWidget);
-
-        final createBtnRect =
-            tester.getRect(find.widgetWithText(ElevatedButton, 'CREATE A ROUTE'));
-        expect(
-          createBtnRect.bottom,
-          lessThanOrEqualTo(viewportSize.height),
-          reason: 'CREATE A ROUTE button should fit inside $viewportSize',
-        );
-
-        if (isLandscape) {
-          tester.view.viewInsets = const FakeViewPadding(bottom: 180);
-          await tester.pump();
-          expect(tester.takeException(), isNull);
-          await tester.pump(const Duration(milliseconds: 200));
-          expect(tester.takeException(), isNull);
-          await tester.ensureVisible(find.text('CREATE A ROUTE'));
-          await tester.pumpAndSettle();
-          expect(tester.takeException(), isNull);
-          final createBtnKeyboardRect = tester
-              .getRect(find.widgetWithText(ElevatedButton, 'CREATE A ROUTE'));
-          expect(
-            createBtnKeyboardRect.bottom,
-            lessThanOrEqualTo(viewportSize.height - 180 + 1.0),
-            reason:
-                'CREATE A ROUTE should remain above keyboard at $viewportSize',
-          );
-        }
-
-        // Dismiss sheet
-        Navigator.of(tester.element(find.text('CREATE A ROUTE'))).pop();
-        await tester.pumpAndSettle();
-      }
-    });
   });
 
   group('LiveGroupRideScreen Responsive Matrix', () {

test/canonical_history_records_garage_responsive_test.dart

@@ -18,7 +18,6 @@ import 'package:motorcycle_dash/features/records/records_service.dart';
 import 'package:motorcycle_dash/features/garage/garage_screen.dart';
 import 'package:motorcycle_dash/features/garage/motorcycle_detail_screen.dart';
 import 'package:motorcycle_dash/features/garage/add_motorcycle_screen.dart';
-import 'package:motorcycle_dash/features/garage/widgets/motorcycle_photo.dart';
 
 class _FakeGitHubSyncService extends ChangeNotifier implements GitHubSyncService {
   @override
@@ -318,109 +317,6 @@ void main() {
         await tester.pump(const Duration(milliseconds: 100));
       });
     }
-
-    testWidgets('BUG-012: HistoryScreen ride cards show all bottom row telemetry without overflow on 800x360 landscape', (tester) async {
-      tester.view.physicalSize = const Size(800, 360);
-      tester.view.devicePixelRatio = 1.0;
-      addTearDown(() => tester.view.resetPhysicalSize());
-
-      await tester.pumpWidget(buildTestApp(const HistoryScreen()));
-      await tester.pump(const Duration(milliseconds: 50));
-      await tester.pumpAndSettle();
-
-      expect(tester.takeException(), isNull);
-      expect(find.byKey(const ValueKey('history_ride_card_1')), findsOneWidget);
-      expect(find.text('TRIP'), findsOneWidget);
-      expect(find.text('TIME'), findsOneWidget);
-      expect(find.text('TOP SPD'), findsOneWidget);
-      expect(find.text('MAX LEAN'), findsOneWidget);
-      expect(find.text('HARD BRK'), findsOneWidget);
-      expect(find.text('ELEV GAIN'), findsOneWidget);
-
-      await tester.pumpWidget(const SizedBox());
-      await tester.pump(const Duration(milliseconds: 100));
-    });
-  });
-
-  group('Garage responsive regression coverage', () {
-    testWidgets('BUG-015: landscape garage card and Add Motorcycle remain reachable', (tester) async {
-      tester.view.physicalSize = const Size(800, 360);
-      tester.view.devicePixelRatio = 1.0;
-      addTearDown(() => tester.view.resetPhysicalSize());
-
-      await tester.pumpWidget(buildTestApp(const GarageScreen()));
-      await tester.pumpAndSettle();
-
-      expect(tester.takeException(), isNull);
-      final grid = tester.widget<GridView>(find.byType(GridView));
-      final delegate = grid.gridDelegate as SliverGridDelegateWithMaxCrossAxisExtent;
-      expect(delegate.mainAxisExtent, lessThanOrEqualTo(320));
-      expect(tester.getSize(find.byType(MotorcyclePhoto).first).height, lessThanOrEqualTo(120));
-      final addMotorcycle = find.text('Add Motorcycle');
-      await tester.ensureVisible(addMotorcycle);
-      expect(addMotorcycle.hitTestable(), findsOneWidget);
-
-      await tester.pumpWidget(buildTestApp(const MotorcycleDetailScreen(motorcycleId: 1)));
-      await tester.pumpAndSettle();
-      await tester.ensureVisible(find.text('SPECIFICATIONS'));
-      expect(tester.takeException(), isNull);
-      expect(tester.getTopLeft(find.text('SPECIFICATIONS')).dy, lessThan(360));
-      await tester.pumpWidget(const SizedBox());
-      await tester.pump(const Duration(milliseconds: 100));
-    });
-
-    for (final keyboardInset in [0.0, 180.0]) {
-      testWidgets('BUG-016: landscape service dialog remains usable with keyboard inset $keyboardInset', (tester) async {
-        tester.view.physicalSize = const Size(800, 360);
-        tester.view.devicePixelRatio = 1.0;
-        tester.view.viewInsets = FakeViewPadding(bottom: keyboardInset);
-        addTearDown(() {
-          tester.view.resetPhysicalSize();
-          tester.view.resetViewInsets();
-        });
-
-        await tester.pumpWidget(buildTestApp(const MotorcycleDetailScreen(motorcycleId: 1)));
-        await tester.pumpAndSettle();
-        await tester.ensureVisible(find.text('Log Service'));
-        await tester.tap(find.text('Log Service'));
-        await tester.pumpAndSettle();
-
-        expect(tester.takeException(), isNull);
-        expect(find.text('Log New Service'), findsOneWidget);
-        final notesLabel = find.text('Notes (e.g. Brand, weight, shop)');
-        await tester.ensureVisible(notesLabel);
-        expect(tester.getBottomRight(notesLabel).dy, lessThan(360 - keyboardInset));
-        expect(find.text('Log New Service').hitTestable(), findsNothing);
-        expect(find.text('Cancel').hitTestable(), findsOneWidget);
-        expect(find.text('Save Record').hitTestable(), findsOneWidget);
-        await tester.tap(find.text('Cancel'));
-        await tester.pumpAndSettle();
-        expect(find.text('Log New Service'), findsNothing);
-        await tester.pumpWidget(const SizedBox());
-        await tester.pump(const Duration(milliseconds: 100));
-      });
-    }
-
-    testWidgets('BUG-017: narrow portrait service type dropdown truncates label without overflow', (tester) async {
-      tester.view.physicalSize = const Size(360, 640);
-      tester.view.devicePixelRatio = 1.0;
-      addTearDown(() => tester.view.resetPhysicalSize());
-
-      await tester.pumpWidget(buildTestApp(const MotorcycleDetailScreen(motorcycleId: 1)));
-      await tester.pumpAndSettle();
-      await tester.ensureVisible(find.text('Log Service'));
-      await tester.tap(find.text('Log Service'));
-      await tester.pumpAndSettle();
-
-      expect(tester.takeException(), isNull);
-      final dropdown = tester.widget<DropdownButton<String>>(find.byType(DropdownButton<String>).first);
-      expect(dropdown.isExpanded, isTrue);
-      final label = tester.widget<Text>(find.text('Engine Oil & Filter').first);
-      expect(label.maxLines, 1);
-      expect(label.overflow, TextOverflow.ellipsis);
-      await tester.pumpWidget(const SizedBox());
-      await tester.pump(const Duration(milliseconds: 100));
-    });
   });
 }
 

test/club_card_test.dart

@@ -43,7 +43,7 @@ void main() {
       expect(find.text('@pacific-coast-riders'), findsOneWidget);
       expect(find.text('Cruising the Pacific Coast Highway together.'), findsOneWidget);
       expect(find.text('42 members'), findsOneWidget);
-      expect(find.text('Request to Join'), findsNothing);
+      expect(find.text('Request to Join'), findsOneWidget);
       expect(find.text('NorCal'), findsOneWidget);
       expect(find.text('Sport Touring'), findsOneWidget);
       expect(find.text('OWNER'), findsOneWidget);
@@ -53,7 +53,7 @@ void main() {
       expect(tapped, isTrue);
     });
 
-    testWidgets('renders open admission badge correctly with group_add_outlined icon', (tester) async {
+    testWidgets('renders open admission badge correctly', (tester) async {
       final openClub = sampleClub.copyWith(admissionPolicy: ClubAdmissionPolicy.open);
 
       await tester.pumpWidget(
@@ -68,26 +68,6 @@ void main() {
       );
 
       expect(find.text('Open to Join'), findsOneWidget);
-      expect(find.byIcon(Icons.group_add_outlined), findsOneWidget);
-      expect(find.byIcon(Icons.lock_open_outlined), findsNothing);
-    });
-
-    for (final role in ClubRole.values) {
-      testWidgets('active ${role.name} has no admission prompt', (tester) async {
-        await tester.pumpWidget(MaterialApp(
-          home: Scaffold(body: ClubCard(club: sampleClub, role: role)),
-        ));
-
-        expect(find.text('Request to Join'), findsNothing);
-      });
-    }
-
-    testWidgets('non-member retains request admission prompt', (tester) async {
-      await tester.pumpWidget(MaterialApp(
-        home: Scaffold(body: ClubCard(club: sampleClub)),
-      ));
-
-      expect(find.text('Request to Join'), findsOneWidget);
     });
 
     testWidgets('suppresses role pill for standard members and shows for admin/owner', (tester) async {

test/club_membership_presentation_test.dart

@@ -31,53 +31,6 @@ void main() {
       expect(p.primaryAction, isNull);
     });
 
-    test('root owner cannot join even with a missing or stale member record', () {
-      for (final status in [null, ...ClubMemberStatus.values]) {
-        final p = ClubMembershipPresentation.resolve(
-          club: baseClub.copyWith(admissionPolicy: ClubAdmissionPolicy.request),
-          member: status == null ? null : ClubMember(
-            uid: 'owner_uid',
-            clubId: baseClub.id,
-            role: ClubRole.member,
-            status: status,
-            updatedAt: DateTime(2026, 1, 1),
-          ),
-          currentUserId: 'owner_uid',
-          isAuthenticated: true,
-        );
-
-        expect(p.state, ClubMembershipPresentationState.activeOwner);
-        expect(p.primaryAction, isNull);
-        expect(p.secondaryAction, isNull);
-        expect(p.canLeave, isFalse);
-      }
-    });
-
-    test('request admission actions respect active, pending and outsider states', () {
-      for (final role in ClubRole.values) {
-        for (final status in [null, ClubMemberStatus.active, ClubMemberStatus.requested]) {
-          final p = ClubMembershipPresentation.resolve(
-            club: baseClub.copyWith(admissionPolicy: ClubAdmissionPolicy.request),
-            member: status == null ? null : ClubMember(
-              uid: 'rider_1',
-              clubId: baseClub.id,
-              role: role,
-              status: status,
-              updatedAt: DateTime(2026, 1, 1),
-            ),
-            currentUserId: 'rider_1',
-            isAuthenticated: true,
-          );
-
-          expect(p.primaryAction, status == null
-              ? ClubMembershipAction.requestToJoin
-              : status == ClubMemberStatus.requested
-                  ? ClubMembershipAction.withdrawRequest
-                  : role == ClubRole.owner ? null : ClubMembershipAction.leaveClub);
-        }
-      }
-    });
-
     test('resolves archived state when club.isArchived is true', () {
       final archivedClub = baseClub.copyWith(archivedAt: DateTime(2026, 2, 1));
       final p = ClubMembershipPresentation.resolve(

test/clubs_hub_screen_test.dart

@@ -225,103 +225,5 @@ void main() {
       expect(find.text('Accept'), findsOneWidget);
       expect(find.text('Decline'), findsOneWidget);
     });
-
-    for (final size in const [Size(800, 360), Size(640, 360), Size(400, 800)]) {
-      testWidgets('renders responsive layout without overflow on $size (#73)', (tester) async {
-        await tester.binding.setSurfaceSize(size);
-        addTearDown(() => tester.binding.setSurfaceSize(null));
-
-        const user = AuthUser(uid: 'alice', isAnonymous: false);
-        final club1 = Club(
-          id: 'club_1',
-          name: 'Bay Area Motos',
-          slug: 'bay-area-motos',
-          description: 'San Francisco & Bay Area motorcycle rides.',
-          ownerUid: 'alice',
-          memberCount: 15,
-          admissionPolicy: ClubAdmissionPolicy.open,
-          createdAt: DateTime(2026, 1, 1),
-          updatedAt: DateTime(2026, 1, 1),
-        );
-        final club2 = Club(
-          id: 'club_2',
-          name: 'NorCal Twisties',
-          slug: 'norcal-twisties',
-          description: 'Carving Northern California canyon roads.',
-          ownerUid: 'bob',
-          memberCount: 24,
-          admissionPolicy: ClubAdmissionPolicy.request,
-          createdAt: DateTime(2026, 1, 1),
-          updatedAt: DateTime(2026, 1, 1),
-        );
-
-        final member1 = ClubMember(
-          uid: 'alice',
-          clubId: 'club_1',
-          status: ClubMemberStatus.active,
-          role: ClubRole.owner,
-          updatedAt: DateTime(2026, 1, 1),
-        );
-        final member2 = ClubMember(
-          uid: 'alice',
-          clubId: 'club_2',
-          status: ClubMemberStatus.active,
-          role: ClubRole.member,
-          updatedAt: DateTime(2026, 1, 1),
-        );
-
-        final fakeService = FakeClubServiceForHub(
-          clubs: {'club_1': club1, 'club_2': club2},
-          handles: {'bay-area-motos': 'club_1', 'norcal-twisties': 'club_2'},
-        );
-
-        await tester.pumpWidget(
-          ProviderScope(
-            overrides: [
-              currentUserProvider.overrideWith((ref) => user),
-              clubServiceProvider.overrideWithValue(fakeService),
-              clubDetailProvider('club_1').overrideWith((ref) => Stream.value(club1)),
-              clubDetailProvider('club_2').overrideWith((ref) => Stream.value(club2)),
-              myClubsProvider.overrideWith((ref) => Stream.value([member1, member2])),
-              myClubInvitesProvider.overrideWith((ref) => Stream.value(const [])),
-              publicClubsProvider.overrideWith((ref) => Future.value([club1, club2])),
-            ],
-            child: MediaQuery(
-              data: MediaQueryData(size: size),
-              child: MaterialApp(
-                theme: ThemeData.dark().copyWith(
-                  extensions: [MotorSignalThemeColors.dark],
-                ),
-                home: const ClubsHubScreen(),
-              ),
-            ),
-          ),
-        );
-
-        await tester.pumpAndSettle();
-
-        expect(tester.takeException(), isNull);
-
-        final isLandscape = size.width > size.height;
-        if (isLandscape) {
-          // Verify GridView is used for memberships in landscape
-          expect(find.byType(GridView), findsOneWidget);
-        } else {
-          expect(find.byType(GridView), findsNothing);
-        }
-
-        // Tap Discover Tab
-        await tester.tap(find.text('DISCOVER'));
-        await tester.pumpAndSettle();
-
-        expect(tester.takeException(), isNull);
-        if (isLandscape) {
-          // Verify GridView is used for discovery in landscape
-          expect(find.byType(GridView), findsOneWidget);
-        } else {
-          expect(find.byType(GridView), findsNothing);
-        }
-      });
-    }
   });
 }

test/community_social_feed_test.dart

@@ -1134,222 +1134,6 @@ void main() {
     }
   });
 
-  group('Issue #71 Landscape Feed Floating Button Overlap', () {
-    for (final viewport in const [
-      Size(800, 360),
-      Size(640, 360),
-      Size(400, 800),
-    ]) {
-      testWidgets(
-        'Empty feed message and action buttons are not covered by share button on ${viewport.width.toInt()}x${viewport.height.toInt()}',
-        (tester) async {
-          await tester.binding.setSurfaceSize(viewport);
-          addTearDown(() => tester.binding.setSurfaceSize(null));
-
-          final service = SocialFeedService();
-          addTearDown(service.dispose);
-
-          await tester.pumpWidget(
-            ProviderScope(
-              overrides: [
-                socialFeedServiceProvider.overrideWithValue(service),
-                feedSearchQueryProvider.overrideWith((ref) => 'nomatchxyz'),
-              ],
-              child: MediaQuery(
-                data: MediaQueryData(size: viewport),
-                child: MaterialApp(
-                  theme: ThemeData.dark().copyWith(
-                    extensions: const [MotorSignalThemeColors.dark],
-                  ),
-                  home: const SocialFeedScreen(),
-                ),
-              ),
-            ),
-          );
-          await tester.pumpAndSettle();
-
-          expect(tester.takeException(), isNull);
-
-          final shareBtnFinder = find.byKey(const ValueKey('feed_share_session_button'));
-          final emptyActionFinder = find.byKey(const ValueKey('empty_feed_group_rides_button'));
-          expect(shareBtnFinder, findsOneWidget);
-          expect(emptyActionFinder, findsOneWidget);
-
-          // Scroll until visible if needed in compact landscape
-          final scrollableFinder = find.byType(Scrollable).last;
-          await tester.scrollUntilVisible(emptyActionFinder, 100, scrollable: scrollableFinder);
-          await tester.pumpAndSettle();
-
-          final shareBtnRect = tester.getRect(shareBtnFinder);
-          final emptyActionRect = tester.getRect(emptyActionFinder);
-
-          expect(emptyActionRect.overlaps(shareBtnRect), isFalse,
-              reason: 'Empty action button $emptyActionRect overlaps share button $shareBtnRect');
-          expect(emptyActionRect.bottom <= shareBtnRect.top, isTrue,
-              reason: 'Empty action button bottom ${emptyActionRect.bottom} should be <= share button top ${shareBtnRect.top}');
-        },
-      );
-
-      testWidgets(
-        'Populated feed list scrolls so last item is above share button on ${viewport.width.toInt()}x${viewport.height.toInt()}',
-        (tester) async {
-          await tester.binding.setSurfaceSize(viewport);
-          addTearDown(() => tester.binding.setSurfaceSize(null));
-
-          final service = SocialFeedService();
-          addTearDown(service.dispose);
-
-          await tester.pumpWidget(
-            ProviderScope(
-              overrides: [
-                socialFeedServiceProvider.overrideWithValue(service),
-              ],
-              child: MediaQuery(
-                data: MediaQueryData(size: viewport),
-                child: MaterialApp(
-                  theme: ThemeData.dark().copyWith(
-                    extensions: const [MotorSignalThemeColors.dark],
-                  ),
-                  home: const SocialFeedScreen(),
-                ),
-              ),
-            ),
-          );
-          await tester.pumpAndSettle();
-
-          expect(tester.takeException(), isNull);
-
-          final shareBtnFinder = find.byKey(const ValueKey('feed_share_session_button'));
-          expect(shareBtnFinder, findsOneWidget);
-
-          // Scroll until the bottom actions of the last post are visible
-          final lastActionFinder = find.byKey(const ValueKey('inspect_telemetry_btn_feed_post_4'));
-          final feedListFinder = find.byKey(const ValueKey('social_feed_list_view'));
-          final feedScrollableFinder = find.descendant(
-            of: feedListFinder,
-            matching: find.byType(Scrollable),
-          );
-          await tester.scrollUntilVisible(
-            lastActionFinder,
-            100,
-            scrollable: feedScrollableFinder,
-          );
-          await tester.pumpAndSettle();
-
-          expect(lastActionFinder, findsOneWidget);
-          final lastActionRect = tester.getRect(lastActionFinder);
-          final shareBtnRect = tester.getRect(shareBtnFinder);
-
-          expect(lastActionRect.overlaps(shareBtnRect), isFalse,
-              reason: 'Last item bottom action $lastActionRect should not overlap share button $shareBtnRect');
-          expect(lastActionRect.bottom <= shareBtnRect.top, isTrue,
-              reason: 'Last item bottom action bottom ${lastActionRect.bottom} should be <= share button top ${shareBtnRect.top}');
-        },
-      );
-    }
-  });
-
-  group('ShareSessionModal Landscape Keyboard & Scroll Layout', () {
-    final testRide = Ride(
-      id: 99,
-      startTime: DateTime(2026, 10, 15, 9, 0),
-      endTime: DateTime(2026, 10, 15, 10, 15),
-      distance: 35.5,
-      distanceMiles: 35.5,
-      movingTime: 3600,
-      stoppedTime: 900,
-      topSpeed: 65.0,
-      topSpeedMph: 65.0,
-      averageSpeed: 35.5,
-      maxLeanLeft: 38.0,
-      maxLeanRight: 42.0,
-      maxAccelG: 0.6,
-      maxBrakingG: 0.7,
-      elevationGain: 1200.0,
-      elevationLoss: 1100.0,
-    );
-
-    for (final viewport in const [
-      Size(800, 360),
-      Size(640, 360),
-      Size(400, 800),
-    ]) {
-      final isLandscape = viewport.width > viewport.height;
-      for (final keyboardInset in isLandscape ? [0.0, 180.0] : [0.0]) {
-        testWidgets(
-          'ShareSessionModal on ${viewport.width.toInt()}x${viewport.height.toInt()} with keyboard inset $keyboardInset has scrollable fields and publish button does not cover title',
-          (tester) async {
-            await tester.binding.setSurfaceSize(viewport);
-            addTearDown(() => tester.binding.setSurfaceSize(null));
-
-            await tester.pumpWidget(
-              ProviderScope(
-                child: MediaQuery(
-                  data: MediaQueryData(
-                    size: viewport,
-                    viewInsets: EdgeInsets.only(bottom: keyboardInset),
-                  ),
-                  child: MaterialApp(
-                    theme: ThemeData.dark().copyWith(
-                      extensions: const [MotorSignalThemeColors.dark],
-                    ),
-                    home: Scaffold(
-                      body: Builder(
-                        builder: (ctx) => ElevatedButton(
-                          key: const ValueKey('open_modal_btn'),
-                          onPressed: () => ShareSessionModal.show(ctx, initialRide: testRide),
-                          child: const Text('Open Modal'),
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            );
-            await tester.pumpAndSettle();
-
-            await tester.tap(find.byKey(const ValueKey('open_modal_btn')));
-            await tester.pumpAndSettle();
-
-            expect(tester.takeException(), isNull);
-
-            final titleFinder = find.byType(TextFormField).first;
-            expect(titleFinder, findsOneWidget);
-
-            final publishBtnFinder = find.widgetWithText(ElevatedButton, 'PUBLISH TO COMMUNITY FEED');
-            expect(publishBtnFinder, findsOneWidget);
-
-            // In landscape or when keyboard is open, title rect must not be overlapped by publish button rect
-            final titleRect = tester.getRect(titleFinder);
-            final publishRect = tester.getRect(publishBtnFinder);
-
-            expect(
-              titleRect.overlaps(publishRect),
-              isFalse,
-              reason: 'Title field $titleRect is covered by publish button $publishRect',
-            );
-
-            // Verify scrolling inside modal allows reaching the publish button and fields
-            final modalScrollable = find.descendant(
-              of: find.byType(ShareSessionModal),
-              matching: find.byType(Scrollable),
-            );
-            expect(modalScrollable, findsWidgets);
-
-            await tester.scrollUntilVisible(
-              publishBtnFinder,
-              100,
-              scrollable: modalScrollable.first,
-            );
-            await tester.pumpAndSettle();
-
-            expect(publishBtnFinder.hitTestable(), findsOneWidget);
-          },
-        );
-      }
-    }
-  });
-
   group('Sprint 1 Remediation: BUG-003 / Sub-Issue #81 Starting Location & Canyon Removal', () {
     testWidgets('ShareSessionModal displays STARTING LOCATION, removes Canyon label, and defaults to Morning Ride', (tester) async {
       await tester.binding.setSurfaceSize(const Size(400, 800));

test/create_club_screen_test.dart

@@ -229,125 +229,5 @@ void main() {
       );
       expect(find.text('Sign In / Register'), findsOneWidget);
     });
-
-    testWidgets(
-      'landscape (800x360) with keyboard inset scrolls to lower fields and submit button, and portrait renders cleanly (#77)',
-      (tester) async {
-        const user = AuthUser(uid: 'alice', isAnonymous: false);
-        final fakeService = FakeCreateClubService();
-
-        // 1. Landscape (800x360) with simulated soft keyboard inset
-        tester.view.physicalSize = const Size(800, 360);
-        tester.view.devicePixelRatio = 1.0;
-        tester.view.viewInsets = const FakeViewPadding(bottom: 180);
-        tester.view.padding = const FakeViewPadding(top: 24);
-        addTearDown(tester.view.resetPhysicalSize);
-        addTearDown(tester.view.resetDevicePixelRatio);
-        addTearDown(tester.view.resetViewInsets);
-        addTearDown(tester.view.resetPadding);
-
-        await tester.pumpWidget(
-          ProviderScope(
-            overrides: [
-              currentUserProvider.overrideWith((ref) => user),
-              clubServiceProvider.overrideWithValue(fakeService),
-            ],
-            child: MaterialApp(
-              theme: ThemeData.dark().copyWith(
-                extensions: [MotorSignalThemeColors.dark],
-              ),
-              home: const CreateClubScreen(),
-            ),
-          ),
-        );
-        await tester.pumpAndSettle();
-        expect(tester.takeException(), isNull);
-
-        // Scrollbar should be present for clear scroll affordance in landscape
-        expect(find.byType(Scrollbar), findsOneWidget);
-
-        // Two-column layout in landscape: Club Name and Club Handle share a row
-        final nameFinder = find.widgetWithText(
-          TextFormField,
-          'Club Name *',
-          skipOffstage: false,
-        );
-        final slugFinder = find.widgetWithText(
-          TextFormField,
-          'Club Handle / Slug *',
-          skipOffstage: false,
-        );
-        expect(nameFinder, findsOneWidget);
-        expect(slugFinder, findsOneWidget);
-
-        await tester.ensureVisible(nameFinder);
-        await tester.pumpAndSettle();
-        expect(tester.takeException(), isNull);
-        expect(
-          tester.getTopLeft(nameFinder).dx,
-          lessThan(tester.getTopLeft(slugFinder).dx),
-        );
-
-        // Enter Club Name & Handle
-        await tester.enterText(nameFinder, 'Canyon Carvers MC');
-        await tester.enterText(slugFinder, 'canyon-carvers-mc');
-        await tester.pump();
-        await tester.pump(const Duration(milliseconds: 500));
-        expect(tester.takeException(), isNull);
-
-        // Lower fields and submit button remain mounted and scrollable into the visible area above keyboard
-        final regionFinder = find.widgetWithText(
-          TextFormField,
-          'Home region (optional)',
-          skipOffstage: false,
-        );
-        final focusFinder = find.widgetWithText(
-          TextFormField,
-          'Motorcycle focus (optional)',
-          skipOffstage: false,
-        );
-        final submitFinder = find.byKey(
-          const ValueKey('create_club_submit_button'),
-          skipOffstage: false,
-        );
-
-        expect(regionFinder, findsOneWidget);
-        expect(focusFinder, findsOneWidget);
-        expect(submitFinder, findsOneWidget);
-
-        await tester.ensureVisible(regionFinder);
-        await tester.pumpAndSettle();
-        expect(tester.takeException(), isNull);
-        expect(
-          tester.getRect(regionFinder).bottom,
-          lessThanOrEqualTo(360.0 - 180.0 + 1.0),
-        );
-
-        await tester.enterText(regionFinder, 'SoCal');
-        await tester.enterText(focusFinder, 'Sport bikes');
-        await tester.pump();
-
-        // Scroll to and tap the primary submit button while keyboard inset is active
-        await tester.ensureVisible(submitFinder);
-        await tester.pumpAndSettle();
-        expect(tester.takeException(), isNull);
-        expect(
-          tester.getRect(submitFinder).bottom,
-          lessThanOrEqualTo(360.0 - 180.0 + 1.0),
-        );
-
-        await tester.tap(submitFinder);
-        await tester.pump();
-        expect(fakeService.lastCreatedClub, isNotNull);
-        expect(fakeService.lastCreatedClub!.name, equals('Canyon Carvers MC'));
-        expect(fakeService.lastCreatedClub!.homeRegion, equals('SoCal'));
-
-        // 2. Portrait (400x800) with keyboard inset check
-        tester.view.physicalSize = const Size(400, 800);
-        tester.view.viewInsets = const FakeViewPadding(bottom: 280);
-        await tester.pumpAndSettle();
-        expect(tester.takeException(), isNull);
-      },
-    );
   });
 }

test/create_group_ride_screen_test.dart

@@ -1130,94 +1130,5 @@ void main() {
       final publishBtn = tester.widget<ElevatedButton>(find.widgetWithText(ElevatedButton, 'PUBLISH CLUB RIDE'));
       expect(publishBtn.onPressed, isNull);
     });
-
-    testWidgets(
-        'renders compact two-column layout in landscape (640x360 and 800x360) with keyboard-safe scrolling and single-column in portrait (#70)',
-        (tester) async {
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-      addTearDown(tester.view.resetViewInsets);
-
-      for (final landscapeSize in const [Size(640, 360), Size(800, 360)]) {
-        tester.view.physicalSize = landscapeSize;
-        tester.view.devicePixelRatio = 1.0;
-        tester.view.resetViewInsets();
-
-        await tester.pumpWidget(
-          ProviderScope(
-            overrides: [
-              currentUserProvider.overrideWithValue(user),
-              myRiderProfileProvider.overrideWith((ref) => Stream.value(profile)),
-            ],
-            child: const MaterialApp(
-              debugShowCheckedModeBanner: false,
-              home: CreateGroupRideScreen(),
-            ),
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        expect(tester.takeException(), isNull);
-
-        // Two-column layout: 3. MEETING LOCATION is to the right of 1. RIDE DETAILS
-        final detailsTopLeft = tester.getTopLeft(find.text('1. RIDE DETAILS'));
-        final meetingTopLeft =
-            tester.getTopLeft(find.text('3. MEETING LOCATION'));
-        expect(
-          meetingTopLeft.dx,
-          greaterThan(detailsTopLeft.dx + 200),
-          reason: 'Expected two-column layout at $landscapeSize',
-        );
-
-        // Compact vertical spacing in landscape so section 2 starts higher up
-        final scheduleTopLeft =
-            tester.getTopLeft(find.text('2. DATE & SCHEDULE'));
-        expect(
-          scheduleTopLeft.dy,
-          lessThan(225.0),
-          reason: 'Expected compact vertical spacing at $landscapeSize',
-        );
-
-        // Simulate keyboard inset in landscape and focus a lower field
-        tester.view.viewInsets = const FakeViewPadding(bottom: 180);
-        await tester.pumpAndSettle();
-        expect(tester.takeException(), isNull);
-
-        final notesField =
-            find.widgetWithText(TextFormField, 'Meeting Notes (optional)');
-        await tester.ensureVisible(notesField);
-        await tester.pumpAndSettle();
-        await tester.enterText(notesField, 'Meet by the north pumps');
-        await tester.pumpAndSettle();
-
-        expect(find.text('Meet by the north pumps'), findsOneWidget);
-        final notesRect = tester.getRect(notesField);
-        expect(
-          notesRect.bottom,
-          lessThanOrEqualTo(landscapeSize.height - 180 + 1.0),
-        );
-
-        final publishBtn =
-            find.widgetWithText(ElevatedButton, 'PUBLISH GROUP RIDE');
-        await tester.ensureVisible(publishBtn);
-        await tester.pumpAndSettle();
-        expect(publishBtn, findsOneWidget);
-        expect(tester.takeException(), isNull);
-      }
-
-      // Portrait check with keyboard inset
-      tester.view.physicalSize = const Size(400, 800);
-      tester.view.devicePixelRatio = 1.0;
-      tester.view.viewInsets = const FakeViewPadding(bottom: 280);
-      await tester.pumpAndSettle();
-      expect(tester.takeException(), isNull);
-
-      final publishBtnPortrait =
-          find.widgetWithText(ElevatedButton, 'PUBLISH GROUP RIDE');
-      await tester.ensureVisible(publishBtnPortrait);
-      await tester.pumpAndSettle();
-      expect(publishBtnPortrait, findsOneWidget);
-      expect(tester.takeException(), isNull);
-    });
   });
 }

test/dashboard_landscape_responsive_test.dart

@@ -20,8 +20,6 @@ import 'package:motorcycle_dash/services/alerts/road_alert_models.dart';
 import 'package:motorcycle_dash/services/alerts/road_alert_service.dart';
 import 'package:motorcycle_dash/services/location_service.dart';
 import 'package:motorcycle_dash/services/telemetry_service.dart';
-import 'package:motorcycle_dash/services/alerts/widgets/quick_swarm_report_modal.dart';
-import 'package:motorcycle_dash/features/social/feed/widgets/quick_squad_feed_button.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 void main() {
@@ -168,81 +166,5 @@ void main() {
       final edgeInsets = paddingWidget.padding as EdgeInsets;
       expect(edgeInsets.right, greaterThanOrEqualTo(16.0));
     });
-
-    testWidgets('BUG-007: Short landscape cockpit mount includes incident report and squad buttons with balanced layout', (tester) async {
-      configureViewport(tester, 800, 360);
-      addTearDown(() => tester.view.resetPhysicalSize());
-
-      await tester.pumpWidget(buildTestDashboard());
-      await tester.pump();
-
-      expect(tester.takeException(), isNull);
-      expect(find.byType(QuickSwarmReportButton), findsOneWidget);
-      expect(find.byType(QuickSquadFeedButton), findsOneWidget);
-      expect(find.byType(SpeedReadout), findsOneWidget);
-    });
-
-    testWidgets('BUG-007 / #54: Start Session button text is fully visible without clipping in minimal landscape (map hidden)', (tester) async {
-      await prefs.setString('dashboardLayout', 'minimal');
-      for (final size in [const Size(640, 360), const Size(800, 360), const Size(840, 390)]) {
-        configureViewport(tester, size.width, size.height);
-
-        await tester.pumpWidget(buildTestDashboard());
-        await tester.pump();
-
-        expect(tester.takeException(), isNull);
-        final startBtnText = find.text('Start Session');
-        expect(startBtnText, findsOneWidget);
-
-        // Verify button text has positive width and fits cleanly
-        final textRenderBox = tester.renderObject(startBtnText) as RenderBox;
-        expect(textRenderBox.size.width, greaterThan(0));
-        expect(textRenderBox.size.height, greaterThan(0));
-      }
-      tester.view.resetPhysicalSize();
-    });
-
-    testWidgets('BUG-007 / #54: Start Session button text is fully visible in sport and touring landscape layouts', (tester) async {
-      for (final layout in ['sport', 'touring']) {
-        await prefs.setString('dashboardLayout', layout);
-        for (final size in [const Size(640, 360), const Size(800, 360), const Size(2000, 900)]) {
-          configureViewport(tester, size.width, size.height);
-
-          await tester.pumpWidget(buildTestDashboard());
-          await tester.pump();
-
-          expect(tester.takeException(), isNull);
-          expect(find.text('Start Session'), findsOneWidget);
-        }
-      }
-      tester.view.resetPhysicalSize();
-    });
-
-    testWidgets('BUG-007 / #54: LEAN ANGLE title does not overlap rider graphic across landscape viewports', (tester) async {
-      await prefs.setString('dashboardLayout', 'sport');
-      for (final size in [const Size(640, 360), const Size(800, 360), const Size(2000, 900)]) {
-        configureViewport(tester, size.width, size.height);
-
-        await tester.pumpWidget(buildTestDashboard());
-        await tester.pump();
-
-        expect(tester.takeException(), isNull);
-
-        final titleFinder = find.text('LEAN ANGLE');
-        final graphicFinder = find.byKey(const ValueKey('lean_angle_rider_graphic'));
-
-        expect(titleFinder, findsOneWidget);
-        expect(graphicFinder, findsOneWidget);
-
-        final titleRect = tester.getRect(titleFinder);
-        final graphicRect = tester.getRect(graphicFinder);
-
-        // Prove no overlap between title rect and rider graphic rect
-        expect(titleRect.overlaps(graphicRect), isFalse, reason: 'Title overlaps rider graphic at ${size.width}x${size.height}');
-        // Prove title is positioned strictly above graphic
-        expect(titleRect.bottom, lessThanOrEqualTo(graphicRect.top), reason: 'Title bottom must be above or at graphic top at ${size.width}x${size.height}');
-      }
-      tester.view.resetPhysicalSize();
-    });
   });
 }

test/group_rides_widget_test.dart

@@ -129,137 +129,6 @@ void main() {
       expect(find.textContaining('Dahlonega Chevron'), findsOneWidget);
       expect(find.text('3'), findsOneWidget);
     });
-
-    testWidgets(
-        'Join Group Ride dialog renders without overflow in landscape with keyboard inset and in portrait (#69)',
-        (tester) async {
-      const user = AuthUser(
-        uid: 'alice',
-        email: 'alice@example.com',
-        isAnonymous: false,
-      );
-
-      tester.view.physicalSize = const Size(800, 360);
-      tester.view.devicePixelRatio = 1.0;
-      tester.view.viewInsets = const FakeViewPadding(bottom: 180);
-      addTearDown(tester.view.resetPhysicalSize);
-      addTearDown(tester.view.resetDevicePixelRatio);
-      addTearDown(tester.view.resetViewInsets);
-
-      await tester.pumpWidget(
-        ProviderScope(
-          overrides: [
-            currentUserProvider.overrideWithValue(user),
-            upcomingGroupRidesProvider.overrideWith(
-              (ref) => Stream.value([]),
-            ),
-          ],
-          child: const MaterialApp(
-            home: GroupRidesHubScreen(),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(
-        find.byKey(const ValueKey('group_rides_join_appbar_button')),
-      );
-      await tester.pumpAndSettle();
-
-      expect(tester.takeException(), isNull);
-
-      final fieldFinder = find.byKey(const ValueKey('join_ride_id_field'));
-      final submitFinder =
-          find.byKey(const ValueKey('join_ride_dialog_submit_button'));
-
-      await tester.ensureVisible(fieldFinder);
-      await tester.pumpAndSettle();
-      await tester.enterText(fieldFinder, 'ride_test_123');
-      await tester.pumpAndSettle();
-      expect(find.text('ride_test_123'), findsOneWidget);
-
-      await tester.ensureVisible(submitFinder);
-      await tester.pumpAndSettle();
-      expect(submitFinder, findsOneWidget);
-      expect(find.text('CANCEL'), findsOneWidget);
-      expect(tester.takeException(), isNull);
-
-      // Dismiss and verify portrait as well
-      await tester.tap(find.text('CANCEL'));
-      await tester.pumpAndSettle();
-
-      tester.view.physicalSize = const Size(400, 800);
-      tester.view.viewInsets = const FakeViewPadding(bottom: 300);
-      await tester.pumpAndSettle();
-
-      await tester.tap(
-        find.byKey(const ValueKey('group_rides_join_appbar_button')),
-      );
-      await tester.pumpAndSettle();
-      expect(tester.takeException(), isNull);
-      expect(fieldFinder, findsOneWidget);
-      expect(submitFinder, findsOneWidget);
-    });
-
-    for (final size in const [Size(800, 360), Size(640, 360), Size(400, 800)]) {
-      testWidgets('ride card renders without overflow on $size (#68)',
-          (tester) async {
-        tester.view.physicalSize = size;
-        tester.view.devicePixelRatio = 1.0;
-        addTearDown(tester.view.resetPhysicalSize);
-
-        const user = AuthUser(
-          uid: 'alice',
-          email: 'alice@example.com',
-          isAnonymous: false,
-        );
-
-        final now = DateTime.now();
-        final ride = GroupRide(
-          id: 'ride_1',
-          organizerUid: 'alice',
-          organizerHandle: 'alice_lead',
-          organizerDisplayName: 'Alice Lead',
-          title: 'Sunday Morning Twisties',
-          scheduledStartAt: now.add(const Duration(days: 1)),
-          departureAt: now.add(const Duration(days: 1, minutes: 30)),
-          participantCount: 3,
-          meetingPoint: const GroupRideLocation(
-            latitude: 34.0,
-            longitude: -84.0,
-            displayName: 'Dahlonega Chevron',
-          ),
-          destination: const GroupRideLocation(
-            latitude: 34.5,
-            longitude: -83.8,
-            displayName: 'Blood Mountain Summit',
-          ),
-          createdAt: now,
-          updatedAt: now,
-        );
-
-        await tester.pumpWidget(
-          ProviderScope(
-            overrides: [
-              currentUserProvider.overrideWithValue(user),
-              upcomingGroupRidesProvider.overrideWith(
-                (ref) => Stream.value([ride]),
-              ),
-            ],
-            child: const MaterialApp(
-              home: GroupRidesHubScreen(),
-            ),
-          ),
-        );
-
-        await tester.pumpAndSettle();
-
-        expect(find.byKey(const ValueKey('group_ride_card_ride_1')), findsOneWidget);
-        expect(find.byKey(const ValueKey('manage_ride_ride_1')), findsOneWidget);
-        expect(find.byKey(const ValueKey('open_hub_ride_1')), findsOneWidget);
-        expect(tester.takeException(), isNull);
-      });
-    }
   });
 
   group('CreateGroupRideScreen Widget Tests', () {

test/live_group_ride_screen_widget_test.dart

@@ -329,70 +329,5 @@ void main() {
       );
       expect(find.text('3 RIDERS'), findsOneWidget);
     });
-
-    for (final size in const [Size(800, 360), Size(640, 360), Size(400, 800)]) {
-      testWidgets('renders landscape controls and panel without overflow on $size (#74)',
-          (tester) async {
-        await tester.binding.setSurfaceSize(size);
-        addTearDown(() => tester.binding.setSurfaceSize(null));
-
-        const user = AuthUser(
-          uid: 'alice',
-          email: 'alice@example.com',
-          isAnonymous: false,
-        );
-
-        await tester.pumpWidget(
-          ProviderScope(
-            overrides: [
-              currentUserProvider.overrideWithValue(user),
-              groupRideStreamProvider('ride_live_test')
-                  .overrideWith((ref) => Stream.value(testRide)),
-              groupRideParticipantsProvider('ride_live_test')
-                  .overrideWith((ref) => Stream.value(participants)),
-              groupRideLivePresenceProvider('ride_live_test')
-                  .overrideWith((ref) => Stream.value(presences)),
-              groupRideLiveSharingAllowedProvider.overrideWith((ref) => true),
-            ],
-            child: MediaQuery(
-              data: MediaQueryData(size: size),
-              child: const MaterialApp(
-                home: LiveGroupRideScreen(rideId: 'ride_live_test'),
-              ),
-            ),
-          ),
-        );
-
-        await tester.pumpAndSettle();
-
-        expect(tester.takeException(), isNull);
-
-        // Verify key controls are present and reachable
-        expect(
-          find.byKey(const ValueKey('live_ride_broadcast_switch')),
-          findsOneWidget,
-        );
-        expect(
-          find.byKey(const ValueKey('live_ride_recenter_button')),
-          findsOneWidget,
-        );
-        expect(
-          find.byKey(const ValueKey('live_ride_roster_button')),
-          findsOneWidget,
-        );
-
-        // Status bar items
-        expect(find.text('RIDING'), findsWidgets);
-        expect(find.text('STOPPED'), findsOneWidget);
-        expect(find.text('NEED FUEL'), findsWidgets);
-        expect(find.text('REGROUP'), findsOneWidget);
-
-        final isLandscape = size.width > size.height;
-        if (isLandscape) {
-          // In landscape, verify side-by-side pack telemetry stream panel is present
-          expect(find.text('PACK TELEMETRY STREAM'), findsOneWidget);
-        }
-      });
-    }
   });
 }

test/map_replay_duplicate_action_test.dart

@@ -1,172 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:motorcycle_dash/core/theme/theme_extensions.dart';
-import 'package:motorcycle_dash/features/map/map_screen.dart';
-import 'package:motorcycle_dash/database/database.dart';
-import 'package:drift/native.dart';
-import 'package:drift/drift.dart' as drift;
-
-class _TestHttpOverrides extends HttpOverrides {
-  @override
-  HttpClient createHttpClient(SecurityContext? context) => _MockHttpClient();
-}
-
-class _MockHttpHeaders extends Fake implements HttpHeaders {
-  @override
-  void add(String name, Object value, {bool preserveHeaderCase = false}) {}
-  @override
-  void set(String name, Object value, {bool preserveHeaderCase = false}) {}
-}
-
-class _MockHttpClient extends Fake implements HttpClient {
-  @override
-  Future<HttpClientRequest> getUrl(Uri url) async => _MockHttpRequest();
-
-  @override
-  Future<HttpClientRequest> openUrl(String method, Uri url) async => _MockHttpRequest();
-
-  @override
-  void close({bool force = false}) {}
-}
-
-class _MockHttpRequest extends Fake implements HttpClientRequest {
-  @override
-  final HttpHeaders headers = _MockHttpHeaders();
-
-  @override
-  bool followRedirects = true;
-
-  @override
-  int maxRedirects = 5;
-
-  @override
-  int contentLength = -1;
-
-  @override
-  Future<HttpClientResponse> close() async => _MockHttpResponse();
-}
-
-class _MockHttpResponse extends Fake implements HttpClientResponse {
-  @override
-  int get statusCode => 200;
-  @override
-  int get contentLength => _transparent1x1Png.length;
-  @override
-  HttpClientResponseCompressionState get compressionState =>
-      HttpClientResponseCompressionState.notCompressed;
-  @override
-  StreamSubscription<List<int>> listen(
-    void Function(List<int> event)? onData, {
-    Function? onError,
-    void Function()? onDone,
-    bool? cancelOnError,
-  }) {
-    return Stream<List<int>>.value(_transparent1x1Png).listen(
-      onData,
-      onError: onError,
-      onDone: onDone,
-      cancelOnError: cancelOnError,
-    );
-  }
-}
-
-final _transparent1x1Png = <int>[
-  0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D,
-  0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1F, 0x15, 0xC4, 0x89, 0x00, 0x00, 0x00,
-  0x0A, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9C, 0x63, 0x00, 0x01, 0x00, 0x00,
-  0x05, 0x00, 0x01, 0x0D, 0x0A, 0x2D, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x49,
-  0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82,
-];
-
-void main() {
-  TestWidgetsFlutterBinding.ensureInitialized();
-
-  late AppDatabase db;
-
-  setUp(() async {
-    HttpOverrides.global = _TestHttpOverrides();
-    db = AppDatabase.forTesting(NativeDatabase.memory());
-
-    // Insert sample ride and telemetry breadcrumbs
-    await db.into(db.rides).insert(
-      RidesCompanion.insert(
-        id: const drift.Value(1),
-        startTime: DateTime(2026, 1, 1, 10, 0),
-        distanceMiles: const drift.Value(15.2),
-        topSpeedMph: const drift.Value(75.0),
-        movingTime: const drift.Value(900),
-        stoppedTime: const drift.Value(60),
-      ),
-    );
-
-    for (int i = 0; i < 10; i++) {
-      await db.into(db.telemetrySamples).insert(
-        TelemetrySamplesCompanion.insert(
-          rideId: 1,
-          timestamp: DateTime(2026, 1, 1, 10, 0, i * 5),
-          latitude: drift.Value(37.3861 + (i * 0.002)),
-          longitude: drift.Value(-122.2641 + (i * 0.002)),
-          speed: drift.Value(35.0 + i),
-          leanAngle: drift.Value(12.0),
-        ),
-      );
-    }
-  });
-
-  tearDown(() async {
-    HttpOverrides.global = null;
-    await db.close();
-  });
-
-  Widget buildSubject() {
-    return ProviderScope(
-      overrides: [
-        databaseProvider.overrideWithValue(db),
-      ],
-      child: MaterialApp(
-        theme: ThemeData.dark().copyWith(
-          extensions: [MotorSignalThemeColors.dark],
-        ),
-        home: const MapScreen(rideId: 1),
-      ),
-    );
-  }
-
-  testWidgets('Portrait: renders both appbar action and floating replay action button', (tester) async {
-    tester.view.physicalSize = const Size(360, 800);
-    tester.view.devicePixelRatio = 1.0;
-    addTearDown(() => tester.view.resetPhysicalSize());
-
-    await tester.pumpWidget(buildSubject());
-    await tester.pumpAndSettle();
-
-    expect(find.byKey(const ValueKey('play_replay_appbar_button')), findsOneWidget);
-    expect(find.byKey(const ValueKey('fire_off_ride_preview_button')), findsOneWidget);
-    expect(tester.takeException(), isNull);
-
-    await tester.pumpWidget(const SizedBox());
-    await tester.pump(const Duration(milliseconds: 100));
-  });
-
-  testWidgets('Landscape: removes duplicate floating replay action to keep map unobstructed (#60)', (tester) async {
-    tester.view.physicalSize = const Size(800, 360);
-    tester.view.devicePixelRatio = 1.0;
-    addTearDown(() => tester.view.resetPhysicalSize());
-
-    await tester.pumpWidget(buildSubject());
-    await tester.pumpAndSettle();
-
-    // Appbar replay action remains accessible
-    expect(find.byKey(const ValueKey('play_replay_appbar_button')), findsOneWidget);
-    // Floating button is hidden in landscape
-    expect(find.byKey(const ValueKey('fire_off_ride_preview_button')), findsNothing);
-    expect(tester.takeException(), isNull);
-
-    await tester.pumpWidget(const SizedBox());
-    await tester.pump(const Duration(milliseconds: 100));
-  });
-}

test/performance_launch_screen_test.dart

@@ -118,22 +118,6 @@ void main() {
       expect(find.text('0–100 MPH'), findsOneWidget);
     });
 
-    testWidgets('BUG-009: Renders cleanly without clipping on 800x360 landscape phone', (tester) async {
-      await tester.pumpWidget(createTestWidget(size: const Size(800, 360)));
-      await tester.pumpAndSettle();
-
-      expect(tester.takeException(), isNull);
-      expect(find.byKey(const ValueKey('launch_mode_auto')), findsOneWidget);
-      expect(find.byKey(const ValueKey('launch_mode_countdown')), findsOneWidget);
-      expect(find.byKey(const ValueKey('launch_target_60')), findsOneWidget);
-      expect(find.byKey(const ValueKey('launch_target_100')), findsOneWidget);
-      expect(find.byKey(const ValueKey('btn_arm_launch')), findsOneWidget);
-      expect(find.text('Auto Launch'), findsOneWidget);
-      expect(find.text('Countdown'), findsOneWidget);
-      expect(find.text('0–60 MPH'), findsOneWidget);
-      expect(find.text('0–100 MPH'), findsOneWidget);
-    });
-
     testWidgets('3. ARM command uses selected configuration and 4. no local fake READY state', (tester) async {
       await tester.pumpWidget(createTestWidget());
       await tester.pumpAndSettle();
@@ -214,21 +198,6 @@ void main() {
       expect(find.text('Tap below to initiate countdown'), findsOneWidget);
     });
 
-    testWidgets('BUG-010: Countdown READY renders without 68px overflow on 800x360 landscape phone', (tester) async {
-      await tester.pumpWidget(createTestWidget(size: const Size(800, 360)));
-      await tester.pumpAndSettle();
-
-      stateMachine.arm(mode: PerformanceLaunchMode.countdown, target: PerformanceLaunchTarget.sixty);
-      telemetryController.add(makeSample(speed: 0.0, confidence: 1.0));
-      await tester.pump(const Duration(milliseconds: 20));
-      await tester.pumpAndSettle();
-
-      expect(tester.takeException(), isNull);
-      expect(find.byKey(const ValueKey('ready_status_badge')), findsOneWidget);
-      expect(find.byKey(const ValueKey('btn_start_countdown')), findsOneWidget);
-      expect(find.text('Start Countdown'), findsOneWidget);
-    });
-
     testWidgets('8. READY survives widget rebuild', (tester) async {
       await tester.pumpWidget(createTestWidget());
       await tester.pumpAndSettle();

test/quick_swarm_report_modal_test.dart

@@ -329,18 +329,5 @@ void main() {
     expect(alerts.reports, isEmpty);
     expect(tester.takeException(), isNull);
   });
-
-  testWidgets('BUG-008: renders cleanly without overflow on 800x360 landscape phone', (tester) async {
-    tester.view.physicalSize = const Size(800, 360);
-    tester.view.devicePixelRatio = 1.0;
-    addTearDown(() => tester.view.resetPhysicalSize());
-
-    await open(tester);
-    expect(tester.takeException(), isNull);
-    expect(find.text('REPORT ROAD INCIDENT'), findsOneWidget);
-    expect(find.text('Police'), findsOneWidget);
-    expect(find.text('Road Hazard'), findsOneWidget);
-    expect(find.text('Weather Hazard'), findsOneWidget);
-  });
 }
 

test/replay_screen_responsive_test.dart

@@ -165,63 +165,4 @@ void main() {
     expect(tester.takeException(), isNull);
     expect(find.text('CORNER APEX BREAKDOWN & GRADING'), findsOneWidget);
   });
-
-  testWidgets('BUG-014 (#61): ReplayScreen renders responsive horizontal split in 800x360 landscape without overflow', (tester) async {
-    tester.view.physicalSize = const Size(800, 360);
-    tester.view.devicePixelRatio = 1.0;
-    addTearDown(() => tester.view.resetPhysicalSize());
-
-    await tester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          databaseProvider.overrideWithValue(db),
-        ],
-        child: const MaterialApp(
-          home: Scaffold(
-            body: ReplayScreen(rideId: 1),
-          ),
-        ),
-      ),
-    );
-
-    await tester.pumpAndSettle();
-    expect(tester.takeException(), isNull);
-
-    // Verifies both map and breakdown table are rendered concurrently in viewport
-    expect(find.text('CORNER APEX BREAKDOWN & GRADING'), findsOneWidget);
-    expect(find.text('SPEED'), findsOneWidget);
-    expect(find.text('LEAN'), findsOneWidget);
-    expect(find.text('G'), findsOneWidget);
-    expect(find.byType(Slider), findsOneWidget);
-    expect(find.byType(Row), findsWidgets);
-
-    await tester.pumpWidget(const SizedBox());
-    await tester.pump(const Duration(milliseconds: 100));
-  });
-
-  testWidgets('BUG-014 (#61): ReplayScreen renders without overflow on 640x320 compact landscape', (tester) async {
-    tester.view.physicalSize = const Size(640, 320);
-    tester.view.devicePixelRatio = 1.0;
-    addTearDown(() => tester.view.resetPhysicalSize());
-
-    await tester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          databaseProvider.overrideWithValue(db),
-        ],
-        child: const MaterialApp(
-          home: Scaffold(
-            body: ReplayScreen(rideId: 1),
-          ),
-        ),
-      ),
-    );
-
-    await tester.pumpAndSettle();
-    expect(tester.takeException(), isNull);
-    expect(find.text('CORNER APEX BREAKDOWN & GRADING'), findsOneWidget);
-
-    await tester.pumpWidget(const SizedBox());
-    await tester.pump(const Duration(milliseconds: 100));
-  });
 }

test/route_planner_initial_location_test.dart

@@ -1,211 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:motorcycle_dash/features/routes/route_planner_screen.dart';
-import 'package:motorcycle_dash/services/auth/auth_providers.dart';
-import 'package:motorcycle_dash/services/auth/auth_user.dart';
-import 'package:motorcycle_dash/services/map/map_provider_interface.dart';
-import 'package:motorcycle_dash/services/map/map_providers.dart';
-import 'package:motorcycle_dash/services/map/open_street_map_provider.dart';
-import 'package:motorcycle_dash/services/map/unified_map_view.dart';
-import 'package:motorcycle_dash/services/routes/route_providers.dart';
-
-class FakeMapProvider extends Fake implements OpenStreetMapProvider {
-  @override
-  Widget buildMapView({
-    required BuildContext context,
-    required AppLatLng center,
-    required double zoom,
-    double bearing = 0.0,
-    required List<AppMapMarker> markers,
-    required List<AppPolyline> polylines,
-    required bool isFollowMode,
-    required MapConfig config,
-    required ValueChanged<AppLatLng>? onPositionChanged,
-    required VoidCallback? onUserInteraction,
-  }) => const SizedBox.expand();
-}
-
-void main() {
-  const riderPosition = AppLatLng(33.749, -84.388);
-  const overview = AppLatLng(39.5, -98.35);
-
-  Future<ProviderContainer> openPlanner(
-    WidgetTester tester,
-    Future<AppLatLng?> location, {
-    bool realMap = false,
-    bool initiallyFollowing = true,
-  }) async {
-    await tester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          currentUserProvider.overrideWith(
-            (ref) => const AuthUser(uid: 'rider'),
-          ),
-          routePlannerLocationProvider.overrideWith((ref) => location),
-          mapFollowStateProvider.overrideWith(
-            (ref) => MapFollowNotifier()..setFollow(initiallyFollowing),
-          ),
-          if (!realMap)
-            openStreetMapProviderInstance.overrideWithValue(FakeMapProvider()),
-        ],
-        child: const MaterialApp(home: RoutePlannerScreen()),
-      ),
-    );
-    await tester.pumpAndSettle();
-    return ProviderScope.containerOf(
-      tester.element(find.byType(RoutePlannerScreen)),
-    );
-  }
-
-  UnifiedMapView map(WidgetTester tester) =>
-      tester.widget(find.byType(UnifiedMapView));
-
-  for (final size in [const Size(360, 640), const Size(800, 360)]) {
-    testWidgets(
-      'known rider position centers the planner at $size without adding a stop',
-      (tester) async {
-        await tester.binding.setSurfaceSize(size);
-        addTearDown(() => tester.binding.setSurfaceSize(null));
-        final container = await openPlanner(
-          tester,
-          Future.value(riderPosition),
-        );
-
-        expect(map(tester).center, riderPosition);
-        expect(map(tester).zoom, 12);
-        expect(container.read(routePlannerNotifierProvider).stops, isEmpty);
-      },
-    );
-  }
-
-  testWidgets('pending or absent location shows an overview without blocking', (
-    tester,
-  ) async {
-    final location = Completer<AppLatLng?>();
-    await openPlanner(tester, location.future);
-
-    expect(find.text('ROUTE PLANNER'), findsOneWidget);
-    expect(map(tester).center, overview);
-    expect(map(tester).zoom, 3);
-
-    location.complete(null);
-    await tester.pumpAndSettle();
-    expect(map(tester).center, overview);
-    expect(map(tester).zoom, 3);
-  });
-
-  testWidgets('cached position arriving later updates the overview', (
-    tester,
-  ) async {
-    final location = Completer<AppLatLng?>();
-    await openPlanner(tester, location.future);
-    expect(map(tester).zoom, 3);
-
-    location.complete(riderPosition);
-    await tester.pumpAndSettle();
-    expect(map(tester).center, riderPosition);
-    expect(map(tester).zoom, 12);
-  });
-
-  testWidgets(
-    'previously panned map does not prevent initial cached centering',
-    (tester) async {
-      final location = Completer<AppLatLng?>();
-      await openPlanner(
-        tester,
-        location.future,
-        realMap: true,
-        initiallyFollowing: false,
-      );
-      final controller = tester
-          .widget<FlutterMap>(find.byType(FlutterMap))
-          .mapController!;
-      expect(controller.camera.center.latitude, overview.latitude);
-
-      location.complete(riderPosition);
-      await tester.pumpAndSettle();
-      expect(
-        controller.camera.center.latitude,
-        closeTo(riderPosition.latitude, 0.00001),
-      );
-      expect(
-        controller.camera.center.longitude,
-        closeTo(riderPosition.longitude, 0.00001),
-      );
-      expect(controller.camera.zoom, 12);
-    },
-  );
-
-  testWidgets('route stops take priority over a late cached rider position', (
-    tester,
-  ) async {
-    final location = Completer<AppLatLng?>();
-    final container = await openPlanner(tester, location.future);
-    container
-        .read(routePlannerNotifierProvider.notifier)
-        .addStop(displayName: 'Route start', latitude: 35.6, longitude: -83.5);
-    await tester.pumpAndSettle();
-
-    expect(map(tester).center, const AppLatLng(35.6, -83.5));
-    expect(map(tester).zoom, 12);
-    location.complete(riderPosition);
-    await tester.pumpAndSettle();
-    expect(map(tester).center, const AppLatLng(35.6, -83.5));
-    expect(map(tester).zoom, 12);
-  });
-
-  test(
-    'location source only reads cache and tolerates unavailable GPS',
-    () async {
-      const channel = MethodChannel('flutter.baseflow.com/geolocator');
-      final calls = <String>[];
-      final messenger =
-          TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger;
-      messenger.setMockMethodCallHandler(channel, (call) async {
-        calls.add(call.method);
-        throw PlatformException(code: 'PERMISSION_DENIED');
-      });
-      addTearDown(() => messenger.setMockMethodCallHandler(channel, null));
-      final container = ProviderContainer();
-      addTearDown(container.dispose);
-
-      expect(await container.read(routePlannerLocationProvider.future), isNull);
-      expect(calls, ['getLastKnownPosition']);
-    },
-  );
-
-  for (final position in [riderPosition, null, const AppLatLng(0, 0)]) {
-    test(
-      'cached location source validates $position without starting GPS',
-      () async {
-        const channel = MethodChannel('flutter.baseflow.com/geolocator');
-        final calls = <String>[];
-        final messenger =
-            TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger;
-        messenger.setMockMethodCallHandler(channel, (call) async {
-          calls.add(call.method);
-          return position == null
-              ? null
-              : {
-                  'latitude': position.latitude,
-                  'longitude': position.longitude,
-                };
-        });
-        addTearDown(() => messenger.setMockMethodCallHandler(channel, null));
-        final container = ProviderContainer();
-        addTearDown(container.dispose);
-
-        expect(
-          await container.read(routePlannerLocationProvider.future),
-          position == riderPosition ? riderPosition : null,
-        );
-        expect(calls, ['getLastKnownPosition']);
-      },
-    );
-  }
-}

test/route_planner_screen_test.dart

@@ -225,77 +225,4 @@ void main() {
     // No RenderFlex overflow
     expect(tester.takeException(), isNull);
   });
-
-  testWidgets(
-      'RoutePlannerScreen landscape (800x360) with status bar and keyboard inset scrolls cleanly and portrait renders cleanly (#76)',
-      (tester) async {
-    addTearDown(tester.view.resetPhysicalSize);
-    addTearDown(tester.view.resetDevicePixelRatio);
-    addTearDown(tester.view.resetPadding);
-    addTearDown(tester.view.resetViewInsets);
-
-    tester.view.physicalSize = const Size(800, 360);
-    tester.view.devicePixelRatio = 1.0;
-    tester.view.padding = const FakeViewPadding(top: 24);
-    tester.view.resetViewInsets();
-
-    await tester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          currentUserProvider.overrideWith((ref) => const AuthUser(
-                uid: 'alice',
-                isAnonymous: false,
-              )),
-          isProSubscriberProvider.overrideWith((ref) => false),
-        ],
-        child: const MaterialApp(
-          home: RoutePlannerScreen(),
-        ),
-      ),
-    );
-    await tester.pumpAndSettle();
-
-    // No 2.5px overflow on landscape with status bar padding
-    expect(tester.takeException(), isNull);
-
-    // Simulate keyboard opening in landscape (260.5px inset)
-    tester.view.viewInsets = const FakeViewPadding(bottom: 200);
-    await tester.pumpAndSettle();
-
-    expect(tester.takeException(), isNull);
-
-    final titleField = find.byType(TextField).first;
-    await tester.ensureVisible(titleField);
-    await tester.pumpAndSettle();
-    await tester.enterText(titleField, 'Cherohala Skyway');
-    await tester.pumpAndSettle();
-
-    expect(find.text('Cherohala Skyway'), findsOneWidget);
-    expect(tester.takeException(), isNull);
-
-    // Scroll down to ADD STOP button and open Add Stop dialog with keyboard inset
-    final addStopBtn =
-        find.byKey(const ValueKey('route_planner_add_stop_button'));
-    await tester.ensureVisible(addStopBtn);
-    await tester.pumpAndSettle();
-    expect(tester.takeException(), isNull);
-
-    await tester.tap(addStopBtn);
-    await tester.pumpAndSettle();
-    expect(tester.takeException(), isNull);
-    expect(find.text('Add Route Stop'), findsOneWidget);
-
-    await tester.ensureVisible(find.text('CANCEL'));
-    await tester.pumpAndSettle();
-    await tester.tap(find.text('CANCEL'));
-    await tester.pumpAndSettle();
-
-    // Portrait check with keyboard inset
-    tester.view.physicalSize = const Size(400, 800);
-    tester.view.padding = const FakeViewPadding(top: 24);
-    tester.view.viewInsets = const FakeViewPadding(bottom: 280);
-    await tester.pumpAndSettle();
-    expect(tester.takeException(), isNull);
-    expect(find.text('SAVE'), findsOneWidget);
-  });
 }