diff --git a/src/lib/ae_events/ae_events__event_badge.ts b/src/lib/ae_events/ae_events__event_badge.ts
index db19d7e0..777bfb3e 100644
--- a/src/lib/ae_events/ae_events__event_badge.ts
+++ b/src/lib/ae_events/ae_events__event_badge.ts
@@ -510,6 +510,7 @@ export const properties_to_save = [
     'event_id',
     'event_badge_template_id',
     'pronouns',
+    'pronouns_override',
     'informal_name',
     'title_names',
     'given_name',
@@ -524,6 +525,8 @@ export const properties_to_save = [
     'affiliations_override',
     'email',
     'email_override',
+    'phone',
+    'phone_override',
     'address_line_1',
     'address_line_2',
     'address_line_3',
@@ -542,6 +545,10 @@ export const properties_to_save = [
     'badge_type_code',
     'badge_type_override',
     'badge_type_code_override',
+    'registration_type',
+    'registration_type_code',
+    'registration_type_override',
+    'registration_type_code_override',
     'external_event_id',
     'external_id',
     'external_person_id',
@@ -558,6 +565,24 @@ export const properties_to_save = [
     'print_count',
     'print_first_datetime',
     'print_last_datetime',
+    'allow_tracking',
+    'agree_to_tc',
+    'other_1_code',
+    'other_2_code',
+    'other_3_code',
+    'other_4_code',
+    'other_5_code',
+    'other_6_code',
+    'other_7_code',
+    'other_8_code',
+    'ticket_1_code',
+    'ticket_2_code',
+    'ticket_3_code',
+    'ticket_4_code',
+    'ticket_5_code',
+    'ticket_6_code',
+    'ticket_7_code',
+    'ticket_8_code',
     'tmp_sort_1',
     'tmp_sort_2',
     'person_external_id',
diff --git a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_review_form.svelte b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_review_form.svelte
index 7d1b154c..579f8272 100644
--- a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_review_form.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_review_form.svelte
@@ -2,24 +2,23 @@
     /**
      * Badge Review Form
      *
-     * A form-based view of badge fields for attendees and staff to review/edit.
+     * Mobile-first form view for attendees and staff to review/edit badge details.
      * Does NOT render the badge layout — that is handled by ae_comp__badge_obj_view.svelte.
      *
      * Access:
      *   - Attendees (passcode-validated): can edit fields listed in can_edit_fields
      *   - Trusted staff: can_edit_fields + additional staff-only fields
-     *   - Administrators: all override fields
+     *   - Administrators: all fields
      *
-     * Field display is driven by the `can_edit_fields` prop, which comes from
-     * event.mod_badges_json.edit_permissions (see ae_comp__event_settings_badges_form.svelte).
+     * Field display is driven by the `can_edit_fields` prop.
      */
 
     interface Props {
         event_id: string;
         event_badge_id: string;
         lq__event_badge_obj?: any;
-        can_edit_fields?: string[];  // Whitelist of field names attendee/staff may edit
-        is_staff?: boolean;          // True = staff view (shows read-only source fields too)
+        can_edit_fields?: string[];  // Whitelist of field names user may edit
+        is_staff?: boolean;          // True = staff view (shows additional fields)
         log_lvl?: number;
     }
 
@@ -27,40 +26,137 @@
         event_id,
         event_badge_id,
         lq__event_badge_obj,
-        can_edit_fields = ['full_name_override', 'professional_title_override', 'affiliations_override', 'location_override'],
+        can_edit_fields = [],
         is_staff = false,
         log_lvl = 0
     }: Props = $props();
 
+    import { browser } from '$app/environment';
     import type { key_val } from '$lib/stores/ae_stores';
-    import { ae_api } from '$lib/stores/ae_stores';
+    import { ae_api, ae_loc } from '$lib/stores/ae_stores';
     import { events_func } from '$lib/ae_events_functions';
+    import { core_func } from '$lib/ae_core/ae_core_functions';
+    import { ae_util } from '$lib/ae_utils/ae_utils';
+    import { Modal } from 'flowbite-svelte';
+    import {
+        Check, RotateCcw, LoaderCircle, Save, X, Pencil, ZoomIn,
+        User, Mail, Phone, Building, MapPin, Briefcase,
+        Tag, Ticket, Flag, FileText, EyeOff, Radio, FileCheck, BadgeQuestionMark
+    } from 'lucide-svelte';
 
-    // *** Editable field state (only fields in can_edit_fields are active)
-    let editable_full_name_override: string = $state('');
-    let editable_professional_title_override: string = $state('');
-    let editable_affiliations_override: string = $state('');
-    let editable_location_override: string = $state('');
-    let editable_email: string = $state('');
-    let editable_badge_type_code: string = $state('');
+    // *** Local edit mode (not related to $ae_loc.edit_mode)
+    let local_edit_active = $state(false);
+
+    // *** Accessibility - text enlargement
+    let txt_enlarge = $state(false);
+
+    // *** Help modal
+    let help_modal_open = $state(false);
+
+    // *** QR Code state
+    let qr_data_url: string = $state('');
+    let qr_hovered = $state(false);  // Hover zoom effect (overlay)
+    let qr_expanded = $state(false); // Click to expand (pushes content)
+
+    // *** Editable field state
+    let editable_pronouns_override: string | null = $state(null);
+    let editable_full_name_override: string | null = $state(null);
+    let editable_professional_title_override: string | null = $state(null);
+    let editable_affiliations_override: string | null = $state(null);
+    let editable_phone_override: string | null = $state(null);
+    let editable_location_override: string | null = $state(null);
+    let editable_allow_tracking: boolean = $state(false);
+    let editable_agree_to_tc: boolean = $state(false);
+
+    // Staff-only fields
+    let editable_email_override: string | null = $state(null);
+    let editable_badge_type_code_override: string | null = $state(null);
+    let editable_registration_type_code_override: string | null = $state(null);
+    let editable_hide: boolean = $state(false);
+    let editable_priority: number | null = $state(null);
+    let editable_notes: string | null = $state(null);
+
+    // Options (other_1_code through other_8_code)
+    let editable_other_1_code: string | null = $state(null);
+    let editable_other_2_code: string | null = $state(null);
+    let editable_other_3_code: string | null = $state(null);
+    let editable_other_4_code: string | null = $state(null);
+    let editable_other_5_code: string | null = $state(null);
+    let editable_other_6_code: string | null = $state(null);
+    let editable_other_7_code: string | null = $state(null);
+    let editable_other_8_code: string | null = $state(null);
+
+    // Tickets (ticket_1_code through ticket_8_code)
+    let editable_ticket_1_code: string | null = $state(null);
+    let editable_ticket_2_code: string | null = $state(null);
+    let editable_ticket_3_code: string | null = $state(null);
+    let editable_ticket_4_code: string | null = $state(null);
+    let editable_ticket_5_code: string | null = $state(null);
+    let editable_ticket_6_code: string | null = $state(null);
+    let editable_ticket_7_code: string | null = $state(null);
+    let editable_ticket_8_code: string | null = $state(null);
 
     let save_status: 'idle' | 'loading' | 'done' | 'error' = $state('idle');
 
     // Initialize from badge object
     $effect(() => {
         if ($lq__event_badge_obj) {
-            editable_full_name_override =
-                $lq__event_badge_obj.full_name_override ?? $lq__event_badge_obj.full_name ?? '';
-            editable_professional_title_override =
-                $lq__event_badge_obj.professional_title_override ?? $lq__event_badge_obj.professional_title ?? '';
-            editable_affiliations_override =
-                $lq__event_badge_obj.affiliations_override ?? $lq__event_badge_obj.affiliations ?? '';
-            editable_location_override =
-                $lq__event_badge_obj.location_override ?? $lq__event_badge_obj.location ?? '';
-            editable_email =
-                $lq__event_badge_obj.email ?? '';
-            editable_badge_type_code =
-                $lq__event_badge_obj.badge_type_code ?? '';
+            // Reset to badge values
+            editable_pronouns_override = $lq__event_badge_obj.pronouns_override ?? null;
+            editable_full_name_override = $lq__event_badge_obj.full_name_override ?? null;
+            editable_professional_title_override = $lq__event_badge_obj.professional_title_override ?? null;
+            editable_affiliations_override = $lq__event_badge_obj.affiliations_override ?? null;
+            editable_phone_override = $lq__event_badge_obj.phone_override ?? null;
+            editable_location_override = $lq__event_badge_obj.location_override ?? null;
+            editable_allow_tracking = $lq__event_badge_obj.allow_tracking ?? false;
+            editable_agree_to_tc = $lq__event_badge_obj.agree_to_tc ?? false;
+
+            editable_email_override = $lq__event_badge_obj.email_override ?? null;
+            editable_badge_type_code_override = $lq__event_badge_obj.badge_type_code_override ?? null;
+            editable_registration_type_code_override = $lq__event_badge_obj.registration_type_code_override ?? null;
+            editable_hide = $lq__event_badge_obj.hide ?? false;
+            editable_priority = $lq__event_badge_obj.priority ?? null;
+            editable_notes = $lq__event_badge_obj.notes ?? null;
+
+            editable_other_1_code = $lq__event_badge_obj.other_1_code ?? null;
+            editable_other_2_code = $lq__event_badge_obj.other_2_code ?? null;
+            editable_other_3_code = $lq__event_badge_obj.other_3_code ?? null;
+            editable_other_4_code = $lq__event_badge_obj.other_4_code ?? null;
+            editable_other_5_code = $lq__event_badge_obj.other_5_code ?? null;
+            editable_other_6_code = $lq__event_badge_obj.other_6_code ?? null;
+            editable_other_7_code = $lq__event_badge_obj.other_7_code ?? null;
+            editable_other_8_code = $lq__event_badge_obj.other_8_code ?? null;
+
+            editable_ticket_1_code = $lq__event_badge_obj.ticket_1_code ?? null;
+            editable_ticket_2_code = $lq__event_badge_obj.ticket_2_code ?? null;
+            editable_ticket_3_code = $lq__event_badge_obj.ticket_3_code ?? null;
+            editable_ticket_4_code = $lq__event_badge_obj.ticket_4_code ?? null;
+            editable_ticket_5_code = $lq__event_badge_obj.ticket_5_code ?? null;
+            editable_ticket_6_code = $lq__event_badge_obj.ticket_6_code ?? null;
+            editable_ticket_7_code = $lq__event_badge_obj.ticket_7_code ?? null;
+            editable_ticket_8_code = $lq__event_badge_obj.ticket_8_code ?? null;
+
+            // Reset edit mode when badge changes
+            local_edit_active = false;
+            save_status = 'idle';
+        }
+    });
+
+    // Generate QR code
+    $effect(() => {
+        if (browser && $lq__event_badge_obj?.event_badge_id) {
+            const params: any = {
+                obj_type: 'event_badge',
+                obj_id: $lq__event_badge_obj.event_badge_id
+            };
+            (async () => {
+                try {
+                    qr_data_url = await core_func.js_generate_qr_code('obj', params);
+                } catch (error: any) {
+                    console.error('QR code generation error:', error);
+                    qr_data_url = '';
+                }
+            })();
         }
     });
 
@@ -69,11 +165,138 @@
         return can_edit_fields.includes('*') || can_edit_fields.includes(field);
     }
 
+    // Derived: has this field been overridden?
     function has_override(base_field: string, override_field: string): boolean {
-        return !!(
-            $lq__event_badge_obj?.[override_field] &&
-            $lq__event_badge_obj[override_field] !== $lq__event_badge_obj[base_field]
+        const base_val = $lq__event_badge_obj?.[base_field];
+        const override_val = $lq__event_badge_obj?.[override_field];
+        return !!(override_val && override_val !== base_val);
+    }
+
+    // Get display value (override || base || empty)
+    function get_display_value(base_field: string, override_field: string): string {
+        return $lq__event_badge_obj?.[override_field] ?? $lq__event_badge_obj?.[base_field] ?? '';
+    }
+
+    // Check if any changes have been made
+    let has_changes = $derived.by(() => {
+        if (!$lq__event_badge_obj) return false;
+
+        return (
+            editable_pronouns_override !== ($lq__event_badge_obj.pronouns_override ?? null) ||
+            editable_full_name_override !== ($lq__event_badge_obj.full_name_override ?? null) ||
+            editable_professional_title_override !== ($lq__event_badge_obj.professional_title_override ?? null) ||
+            editable_affiliations_override !== ($lq__event_badge_obj.affiliations_override ?? null) ||
+            editable_phone_override !== ($lq__event_badge_obj.phone_override ?? null) ||
+            editable_location_override !== ($lq__event_badge_obj.location_override ?? null) ||
+            editable_allow_tracking !== ($lq__event_badge_obj.allow_tracking ?? false) ||
+            editable_agree_to_tc !== ($lq__event_badge_obj.agree_to_tc ?? false) ||
+            editable_email_override !== ($lq__event_badge_obj.email_override ?? null) ||
+            editable_badge_type_code_override !== ($lq__event_badge_obj.badge_type_code_override ?? null) ||
+            editable_registration_type_code_override !== ($lq__event_badge_obj.registration_type_code_override ?? null) ||
+            editable_hide !== ($lq__event_badge_obj.hide ?? false) ||
+            editable_priority !== ($lq__event_badge_obj.priority ?? null) ||
+            editable_notes !== ($lq__event_badge_obj.notes ?? null) ||
+            editable_other_1_code !== ($lq__event_badge_obj.other_1_code ?? null) ||
+            editable_other_2_code !== ($lq__event_badge_obj.other_2_code ?? null) ||
+            editable_other_3_code !== ($lq__event_badge_obj.other_3_code ?? null) ||
+            editable_other_4_code !== ($lq__event_badge_obj.other_4_code ?? null) ||
+            editable_other_5_code !== ($lq__event_badge_obj.other_5_code ?? null) ||
+            editable_other_6_code !== ($lq__event_badge_obj.other_6_code ?? null) ||
+            editable_other_7_code !== ($lq__event_badge_obj.other_7_code ?? null) ||
+            editable_other_8_code !== ($lq__event_badge_obj.other_8_code ?? null) ||
+            editable_ticket_1_code !== ($lq__event_badge_obj.ticket_1_code ?? null) ||
+            editable_ticket_2_code !== ($lq__event_badge_obj.ticket_2_code ?? null) ||
+            editable_ticket_3_code !== ($lq__event_badge_obj.ticket_3_code ?? null) ||
+            editable_ticket_4_code !== ($lq__event_badge_obj.ticket_4_code ?? null) ||
+            editable_ticket_5_code !== ($lq__event_badge_obj.ticket_5_code ?? null) ||
+            editable_ticket_6_code !== ($lq__event_badge_obj.ticket_6_code ?? null) ||
+            editable_ticket_7_code !== ($lq__event_badge_obj.ticket_7_code ?? null) ||
+            editable_ticket_8_code !== ($lq__event_badge_obj.ticket_8_code ?? null)
         );
+    });
+
+    // Toggle edit mode
+    function toggle_edit_mode() {
+        if (local_edit_active && !has_changes) {
+            // Cancel with no changes
+            local_edit_active = false;
+        } else {
+            // Enter edit mode
+            local_edit_active = !local_edit_active;
+        }
+    }
+
+    // Revert a specific override field
+    function revert_override(override_field: string) {
+        switch(override_field) {
+            case 'pronouns_override': editable_pronouns_override = null; break;
+            case 'full_name_override': editable_full_name_override = null; break;
+            case 'professional_title_override': editable_professional_title_override = null; break;
+            case 'affiliations_override': editable_affiliations_override = null; break;
+            case 'phone_override': editable_phone_override = null; break;
+            case 'location_override': editable_location_override = null; break;
+            case 'email_override': editable_email_override = null; break;
+            case 'badge_type_code_override': editable_badge_type_code_override = null; break;
+            case 'registration_type_code_override': editable_registration_type_code_override = null; break;
+        }
+    }
+
+    // Helper to get option code by index
+    function get_option_code(idx: number): string | null {
+        switch(idx) {
+            case 1: return editable_other_1_code;
+            case 2: return editable_other_2_code;
+            case 3: return editable_other_3_code;
+            case 4: return editable_other_4_code;
+            case 5: return editable_other_5_code;
+            case 6: return editable_other_6_code;
+            case 7: return editable_other_7_code;
+            case 8: return editable_other_8_code;
+            default: return null;
+        }
+    }
+
+    // Helper to set option code by index
+    function set_option_code(idx: number, value: string | null) {
+        switch(idx) {
+            case 1: editable_other_1_code = value; break;
+            case 2: editable_other_2_code = value; break;
+            case 3: editable_other_3_code = value; break;
+            case 4: editable_other_4_code = value; break;
+            case 5: editable_other_5_code = value; break;
+            case 6: editable_other_6_code = value; break;
+            case 7: editable_other_7_code = value; break;
+            case 8: editable_other_8_code = value; break;
+        }
+    }
+
+    // Helper to get ticket code by index
+    function get_ticket_code(idx: number): string | null {
+        switch(idx) {
+            case 1: return editable_ticket_1_code;
+            case 2: return editable_ticket_2_code;
+            case 3: return editable_ticket_3_code;
+            case 4: return editable_ticket_4_code;
+            case 5: return editable_ticket_5_code;
+            case 6: return editable_ticket_6_code;
+            case 7: return editable_ticket_7_code;
+            case 8: return editable_ticket_8_code;
+            default: return null;
+        }
+    }
+
+    // Helper to set ticket code by index
+    function set_ticket_code(idx: number, value: string | null) {
+        switch(idx) {
+            case 1: editable_ticket_1_code = value; break;
+            case 2: editable_ticket_2_code = value; break;
+            case 3: editable_ticket_3_code = value; break;
+            case 4: editable_ticket_4_code = value; break;
+            case 5: editable_ticket_5_code = value; break;
+            case 6: editable_ticket_6_code = value; break;
+            case 7: editable_ticket_7_code = value; break;
+            case 8: editable_ticket_8_code = value; break;
+        }
     }
 
     async function handle_save() {
@@ -82,44 +305,49 @@
         save_status = 'loading';
         const data_to_update: key_val = {};
 
-        // Only include fields in can_edit_fields that have changed
-        if (can_edit('full_name_override')) {
-            const original = $lq__event_badge_obj.full_name_override ?? $lq__event_badge_obj.full_name ?? '';
-            if (editable_full_name_override !== original) {
-                data_to_update.full_name_override = editable_full_name_override || null;
+        // Helper to add changed fields
+        const add_if_changed = (field: string, editable_val: any, original_val: any) => {
+            if (can_edit(field) && editable_val !== original_val) {
+                data_to_update[field] = editable_val;
             }
-        }
-        if (can_edit('professional_title_override')) {
-            const original = $lq__event_badge_obj.professional_title_override ?? $lq__event_badge_obj.professional_title ?? '';
-            if (editable_professional_title_override !== original) {
-                data_to_update.professional_title_override = editable_professional_title_override || null;
-            }
-        }
-        if (can_edit('affiliations_override')) {
-            const original = $lq__event_badge_obj.affiliations_override ?? $lq__event_badge_obj.affiliations ?? '';
-            if (editable_affiliations_override !== original) {
-                data_to_update.affiliations_override = editable_affiliations_override || null;
-            }
-        }
-        if (can_edit('location_override')) {
-            const original = $lq__event_badge_obj.location_override ?? $lq__event_badge_obj.location ?? '';
-            if (editable_location_override !== original) {
-                data_to_update.location_override = editable_location_override || null;
-            }
-        }
-        if (can_edit('email')) {
-            if (editable_email !== ($lq__event_badge_obj.email ?? '')) {
-                data_to_update.email = editable_email || null;
-            }
-        }
-        if (can_edit('badge_type_code')) {
-            if (editable_badge_type_code !== ($lq__event_badge_obj.badge_type_code ?? '')) {
-                data_to_update.badge_type_code = editable_badge_type_code || null;
-            }
-        }
+        };
+
+        add_if_changed('pronouns_override', editable_pronouns_override, $lq__event_badge_obj.pronouns_override ?? null);
+        add_if_changed('full_name_override', editable_full_name_override, $lq__event_badge_obj.full_name_override ?? null);
+        add_if_changed('professional_title_override', editable_professional_title_override, $lq__event_badge_obj.professional_title_override ?? null);
+        add_if_changed('affiliations_override', editable_affiliations_override, $lq__event_badge_obj.affiliations_override ?? null);
+        add_if_changed('phone_override', editable_phone_override, $lq__event_badge_obj.phone_override ?? null);
+        add_if_changed('location_override', editable_location_override, $lq__event_badge_obj.location_override ?? null);
+        add_if_changed('allow_tracking', editable_allow_tracking, $lq__event_badge_obj.allow_tracking ?? false);
+        add_if_changed('agree_to_tc', editable_agree_to_tc, $lq__event_badge_obj.agree_to_tc ?? false);
+        add_if_changed('email_override', editable_email_override, $lq__event_badge_obj.email_override ?? null);
+        add_if_changed('badge_type_code_override', editable_badge_type_code_override, $lq__event_badge_obj.badge_type_code_override ?? null);
+        add_if_changed('registration_type_code_override', editable_registration_type_code_override, $lq__event_badge_obj.registration_type_code_override ?? null);
+        add_if_changed('hide', editable_hide, $lq__event_badge_obj.hide ?? false);
+        add_if_changed('priority', editable_priority, $lq__event_badge_obj.priority ?? null);
+        add_if_changed('notes', editable_notes, $lq__event_badge_obj.notes ?? null);
+
+        add_if_changed('other_1_code', editable_other_1_code, $lq__event_badge_obj.other_1_code ?? null);
+        add_if_changed('other_2_code', editable_other_2_code, $lq__event_badge_obj.other_2_code ?? null);
+        add_if_changed('other_3_code', editable_other_3_code, $lq__event_badge_obj.other_3_code ?? null);
+        add_if_changed('other_4_code', editable_other_4_code, $lq__event_badge_obj.other_4_code ?? null);
+        add_if_changed('other_5_code', editable_other_5_code, $lq__event_badge_obj.other_5_code ?? null);
+        add_if_changed('other_6_code', editable_other_6_code, $lq__event_badge_obj.other_6_code ?? null);
+        add_if_changed('other_7_code', editable_other_7_code, $lq__event_badge_obj.other_7_code ?? null);
+        add_if_changed('other_8_code', editable_other_8_code, $lq__event_badge_obj.other_8_code ?? null);
+
+        add_if_changed('ticket_1_code', editable_ticket_1_code, $lq__event_badge_obj.ticket_1_code ?? null);
+        add_if_changed('ticket_2_code', editable_ticket_2_code, $lq__event_badge_obj.ticket_2_code ?? null);
+        add_if_changed('ticket_3_code', editable_ticket_3_code, $lq__event_badge_obj.ticket_3_code ?? null);
+        add_if_changed('ticket_4_code', editable_ticket_4_code, $lq__event_badge_obj.ticket_4_code ?? null);
+        add_if_changed('ticket_5_code', editable_ticket_5_code, $lq__event_badge_obj.ticket_5_code ?? null);
+        add_if_changed('ticket_6_code', editable_ticket_6_code, $lq__event_badge_obj.ticket_6_code ?? null);
+        add_if_changed('ticket_7_code', editable_ticket_7_code, $lq__event_badge_obj.ticket_7_code ?? null);
+        add_if_changed('ticket_8_code', editable_ticket_8_code, $lq__event_badge_obj.ticket_8_code ?? null);
 
         if (Object.keys(data_to_update).length === 0) {
-            save_status = 'done';
+            save_status = 'idle';
+            local_edit_active = false;
             return;
         }
 
@@ -132,251 +360,834 @@
                 log_lvl
             });
             save_status = 'done';
+            setTimeout(() => {
+                save_status = 'idle';
+                local_edit_active = false;
+            }, 2000);
         } catch (error) {
             console.error('Error saving badge review changes:', error);
             save_status = 'error';
+            setTimeout(() => {
+                save_status = 'idle';
+            }, 3000);
         }
     }
 
     function handle_cancel() {
         if ($lq__event_badge_obj) {
-            editable_full_name_override =
-                $lq__event_badge_obj.full_name_override ?? $lq__event_badge_obj.full_name ?? '';
-            editable_professional_title_override =
-                $lq__event_badge_obj.professional_title_override ?? $lq__event_badge_obj.professional_title ?? '';
-            editable_affiliations_override =
-                $lq__event_badge_obj.affiliations_override ?? $lq__event_badge_obj.affiliations ?? '';
-            editable_location_override =
-                $lq__event_badge_obj.location_override ?? $lq__event_badge_obj.location ?? '';
-            editable_email = $lq__event_badge_obj.email ?? '';
-            editable_badge_type_code = $lq__event_badge_obj.badge_type_code ?? '';
+            // Reset all fields
+            editable_pronouns_override = $lq__event_badge_obj.pronouns_override ?? null;
+            editable_full_name_override = $lq__event_badge_obj.full_name_override ?? null;
+            editable_professional_title_override = $lq__event_badge_obj.professional_title_override ?? null;
+            editable_affiliations_override = $lq__event_badge_obj.affiliations_override ?? null;
+            editable_phone_override = $lq__event_badge_obj.phone_override ?? null;
+            editable_location_override = $lq__event_badge_obj.location_override ?? null;
+            editable_allow_tracking = $lq__event_badge_obj.allow_tracking ?? false;
+            editable_agree_to_tc = $lq__event_badge_obj.agree_to_tc ?? false;
+
+            editable_email_override = $lq__event_badge_obj.email_override ?? null;
+            editable_badge_type_code_override = $lq__event_badge_obj.badge_type_code_override ?? null;
+            editable_registration_type_code_override = $lq__event_badge_obj.registration_type_code_override ?? null;
+            editable_hide = $lq__event_badge_obj.hide ?? false;
+            editable_priority = $lq__event_badge_obj.priority ?? null;
+            editable_notes = $lq__event_badge_obj.notes ?? null;
+
+            editable_other_1_code = $lq__event_badge_obj.other_1_code ?? null;
+            editable_other_2_code = $lq__event_badge_obj.other_2_code ?? null;
+            editable_other_3_code = $lq__event_badge_obj.other_3_code ?? null;
+            editable_other_4_code = $lq__event_badge_obj.other_4_code ?? null;
+            editable_other_5_code = $lq__event_badge_obj.other_5_code ?? null;
+            editable_other_6_code = $lq__event_badge_obj.other_6_code ?? null;
+            editable_other_7_code = $lq__event_badge_obj.other_7_code ?? null;
+            editable_other_8_code = $lq__event_badge_obj.other_8_code ?? null;
+
+            editable_ticket_1_code = $lq__event_badge_obj.ticket_1_code ?? null;
+            editable_ticket_2_code = $lq__event_badge_obj.ticket_2_code ?? null;
+            editable_ticket_3_code = $lq__event_badge_obj.ticket_3_code ?? null;
+            editable_ticket_4_code = $lq__event_badge_obj.ticket_4_code ?? null;
+            editable_ticket_5_code = $lq__event_badge_obj.ticket_5_code ?? null;
+            editable_ticket_6_code = $lq__event_badge_obj.ticket_6_code ?? null;
+            editable_ticket_7_code = $lq__event_badge_obj.ticket_7_code ?? null;
+            editable_ticket_8_code = $lq__event_badge_obj.ticket_8_code ?? null;
         }
         save_status = 'idle';
+        local_edit_active = false;
     }
 </script>
 
 {#if $lq__event_badge_obj}
-    <div class="space-y-6 max-w-2xl">
+    <div class="relative min-w-full md:min-w-2xl w-full max-w-3xl mx-auto">
 
-        <!-- Source data header (staff only) -->
-        {#if is_staff}
-            <div class="card p-3 variant-soft-surface text-sm space-y-1">
-                <p class="font-semibold text-xs uppercase tracking-wide text-gray-500">Source Data (from registration system — read only)</p>
-                <div class="grid grid-cols-2 gap-x-4 gap-y-0.5 text-xs">
-                    <span class="text-gray-500">Given Name</span>
-                    <span>{$lq__event_badge_obj.given_name ?? '—'}</span>
-                    <span class="text-gray-500">Family Name</span>
-                    <span>{$lq__event_badge_obj.family_name ?? '—'}</span>
-                    <span class="text-gray-500">Full Name</span>
-                    <span>{$lq__event_badge_obj.full_name ?? '—'}</span>
-                    <span class="text-gray-500">Professional Title</span>
-                    <span>{$lq__event_badge_obj.professional_title ?? '—'}</span>
-                    <span class="text-gray-500">Affiliations</span>
-                    <span>{$lq__event_badge_obj.affiliations ?? '—'}</span>
-                    <span class="text-gray-500">Location</span>
-                    <span>{$lq__event_badge_obj.location ?? '—'}</span>
-                    <span class="text-gray-500">Badge Type</span>
-                    <span>{$lq__event_badge_obj.badge_type_code ?? '—'}</span>
-                </div>
-            </div>
-        {/if}
-
-        <!-- Editable fields -->
-        <div class="space-y-4">
-            <p class="text-sm text-gray-500 italic">
-                Fields below are what will appear on your printed badge.
-                {#if can_edit_fields.length > 0}
-                    You may edit the highlighted fields.
-                {/if}
-            </p>
-
-            <!-- Full Name -->
-            {#if can_edit('full_name_override') || is_staff}
-                <div class="space-y-1">
-                    <label for="badge-review-full-name" class="block text-sm font-medium">
-                        Full Name (on badge)
-                        {#if has_override('full_name', 'full_name_override')}
-                            <span class="text-xs text-amber-600 ml-1">(overridden)</span>
-                        {/if}
-                    </label>
-                    {#if can_edit('full_name_override')}
-                        <input
-                            id="badge-review-full-name"
-                            type="text"
-                            class="input w-full"
-                            bind:value={editable_full_name_override}
-                            placeholder={$lq__event_badge_obj.full_name ?? 'Full name'}
-                            data-testid="badge-review-full-name-input"
-                        />
-                    {:else}
-                        <p class="input w-full bg-gray-50 opacity-60 cursor-not-allowed">
-                            {$lq__event_badge_obj.full_name_override ?? $lq__event_badge_obj.full_name ?? '—'}
-                        </p>
-                    {/if}
-                </div>
-            {/if}
-
-            <!-- Professional Title -->
-            {#if can_edit('professional_title_override') || is_staff}
-                <div class="space-y-1">
-                    <label for="badge-review-pro-title" class="block text-sm font-medium">
-                        Professional Title (on badge)
-                        {#if has_override('professional_title', 'professional_title_override')}
-                            <span class="text-xs text-amber-600 ml-1">(overridden)</span>
-                        {/if}
-                    </label>
-                    {#if can_edit('professional_title_override')}
-                        <input
-                            id="badge-review-pro-title"
-                            type="text"
-                            class="input w-full"
-                            bind:value={editable_professional_title_override}
-                            placeholder={$lq__event_badge_obj.professional_title ?? 'Professional title'}
-                            data-testid="badge-review-pro-title-input"
-                        />
-                    {:else}
-                        <p class="input w-full bg-gray-50 opacity-60 cursor-not-allowed">
-                            {$lq__event_badge_obj.professional_title_override ?? $lq__event_badge_obj.professional_title ?? '—'}
-                        </p>
-                    {/if}
-                </div>
-            {/if}
-
-            <!-- Affiliations -->
-            {#if can_edit('affiliations_override') || is_staff}
-                <div class="space-y-1">
-                    <label for="badge-review-affiliations" class="block text-sm font-medium">
-                        Affiliations / Organization (on badge)
-                        {#if has_override('affiliations', 'affiliations_override')}
-                            <span class="text-xs text-amber-600 ml-1">(overridden)</span>
-                        {/if}
-                    </label>
-                    {#if can_edit('affiliations_override')}
-                        <textarea
-                            id="badge-review-affiliations"
-                            class="textarea w-full"
-                            rows="2"
-                            bind:value={editable_affiliations_override}
-                            placeholder={$lq__event_badge_obj.affiliations ?? 'Affiliations / organization'}
-                            data-testid="badge-review-affiliations-input"
-                        ></textarea>
-                    {:else}
-                        <p class="input w-full bg-gray-50 opacity-60 cursor-not-allowed">
-                            {$lq__event_badge_obj.affiliations_override ?? $lq__event_badge_obj.affiliations ?? '—'}
-                        </p>
-                    {/if}
-                </div>
-            {/if}
-
-            <!-- Location -->
-            {#if can_edit('location_override') || is_staff}
-                <div class="space-y-1">
-                    <label for="badge-review-location" class="block text-sm font-medium">
-                        Location (on badge)
-                        {#if has_override('location', 'location_override')}
-                            <span class="text-xs text-amber-600 ml-1">(overridden)</span>
-                        {/if}
-                    </label>
-                    {#if can_edit('location_override')}
-                        <input
-                            id="badge-review-location"
-                            type="text"
-                            class="input w-full"
-                            bind:value={editable_location_override}
-                            placeholder={$lq__event_badge_obj.location ?? 'City, State/Province, Country'}
-                            data-testid="badge-review-location-input"
-                        />
-                    {:else}
-                        <p class="input w-full bg-gray-50 opacity-60 cursor-not-allowed">
-                            {$lq__event_badge_obj.location_override ?? $lq__event_badge_obj.location ?? '—'}
-                        </p>
-                    {/if}
-                </div>
-            {/if}
-
-            <!-- Email (staff only by default) -->
-            {#if can_edit('email')}
-                <div class="space-y-1">
-                    <label for="badge-review-email" class="block text-sm font-medium">
-                        Email
-                    </label>
-                    <input
-                        id="badge-review-email"
-                        type="email"
-                        class="input w-full"
-                        bind:value={editable_email}
-                        placeholder="Email address"
-                        data-testid="badge-review-email-input"
-                    />
-                </div>
-            {/if}
-
-            <!-- Badge Type Code (staff only by default) -->
-            {#if can_edit('badge_type_code')}
-                <div class="space-y-1">
-                    <label for="badge-review-badge-type" class="block text-sm font-medium">
-                        Badge Type Code
-                    </label>
-                    <input
-                        id="badge-review-badge-type"
-                        type="text"
-                        class="input w-full"
-                        bind:value={editable_badge_type_code}
-                        placeholder="e.g. current_member, guest, staff"
-                        data-testid="badge-review-badge-type-input"
-                    />
-                </div>
-            {/if}
-        </div>
-
-        <!-- Save / Cancel -->
-        {#if can_edit_fields.length > 0}
-            <div class="flex flex-row gap-2 items-center">
+        <!-- Sticky header with all action buttons -->
+        <div class="sticky top-0 z-10 bg-surface-50 dark:bg-surface-900 border-b border-gray-300 py-3 px-4 mb-4 w-full">
+            <header class="flex flex-wrap items-center justify-center md:justify-between gap-3 w-full">
+                <h3 class="text-lg font-semibold">Badge Review</h3>
+                <!-- Help: Give attendee information about what this page and next steps -->
                 <button
                     type="button"
-                    class="btn preset-filled-primary"
-                    class:preset-tonal-primary={save_status === 'loading'}
-                    class:preset-filled-success-500={save_status === 'done'}
-                    class:preset-filled-error-500={save_status === 'error'}
-                    disabled={save_status === 'loading'}
-                    onclick={handle_save}
-                    data-testid="badge-review-save-btn"
+                    class="btn btn-sm preset-tonal-surface preset-outlined-surface-100-900"
+                    onclick={() => { help_modal_open = true; }}
+                    title="Attendee badge review and printing help"
                 >
-                    {#if save_status === 'loading'}
-                        <span class="fas fa-spinner fa-spin mr-2"></span> Saving…
-                    {:else if save_status === 'done'}
-                        <span class="fas fa-check mr-2"></span> Saved
-                    {:else if save_status === 'error'}
-                        <span class="fas fa-exclamation-triangle mr-2"></span> Error — try again
-                    {:else}
-                        <span class="fas fa-save mr-2"></span> Save Changes
-                    {/if}
+                    <BadgeQuestionMark size="14" />
+                    <span class="ml-1 text-base">Help</span>
                 </button>
 
-                {#if save_status !== 'done'}
+                <!-- Accessibility: Font size toggle -->
+                <button
+                    type="button"
+                    class="btn btn-sm preset-tonal-surface preset-outlined-surface-100-900"
+                    class:preset-tonal-surface={!txt_enlarge}
+                    class:preset-filled-primary={txt_enlarge}
+                    onclick={() => { txt_enlarge = !txt_enlarge; }}
+                    title="{txt_enlarge ? 'Decrease font size' : 'Increase font size'}"
+                >
+                    <ZoomIn size="14" />
+                    <span class="ml-1 text-base">{txt_enlarge ? 'Smaller' : 'Larger'}</span>
+                </button>
+
+                {#if can_edit_fields.length > 0}
+                    <div class="flex flex-wrap items-center justify-center gap-1">
+                    {#if local_edit_active}
+                        <!-- Save button (primary) - only show if changes exist -->
+                        {#if has_changes}
+                            <button
+                                type="button"
+                                class="btn btn-lg preset-tonal-warning preset-outlined-warning-100-900"
+                                class:preset-filled-primary={save_status === 'idle'}
+                                class:preset-tonal-primary={save_status === 'loading'}
+                                class:preset-filled-success-500={save_status === 'done'}
+                                class:preset-filled-error-500={save_status === 'error'}
+                                disabled={save_status === 'loading'}
+                                onclick={handle_save}
+                                data-testid="badge-review-save-btn"
+                                title="Save changes to badge information"
+                            >
+                                {#if save_status === 'loading'}
+                                    <LoaderCircle size="16" class="animate-spin" />
+                                {:else if save_status === 'done'}
+                                    <Check size="16" />
+                                {:else}
+                                    <Save size="16" />
+                                {/if}
+                                <span class="ml-2">
+                                    {#if save_status === 'loading'}
+                                        Saving…
+                                    {:else if save_status === 'done'}
+                                        Saved!
+                                    {:else if save_status === 'error'}
+                                        Error — try again
+                                    {:else}
+                                        Save
+                                    {/if}
+                                </span>
+                            </button>
+                        {/if}
+
+                        <!-- Cancel button (secondary) -->
+                        {#if save_status !== 'done'}
+                            <button
+                                type="button"
+                                class="btn btn-lg preset-tonal-warning preset-outlined-warning-100-900"
+                                class:w-48={!has_changes}
+                                onclick={handle_cancel}
+                                data-testid="badge-review-cancel-btn"
+                                title="Cancel changes"
+                            >
+                                <X size="16" />
+                                <span
+                                    class="ml-2"
+                                    class:hidden={has_changes}
+                                    >Cancel</span>
+                            </button>
+                        {/if}
+                    {:else}
+                        <!-- Edit Details button (primary, prominent when inactive) -->
+                        <button
+                            type="button"
+                            class="btn btn-lg preset-filled-primary preset-outlined-primary-100-900 w-48"
+                            onclick={toggle_edit_mode}
+                        >
+                            <Pencil size="20" />
+                            <span class="ml-2">Edit Details</span>
+                        </button>
+                    {/if}
+                    </div>
+                {/if}
+            </header>
+        </div>
+
+        <div class="space-y-6 px-4 pb-4">
+
+            <!-- Section 1: Print Status (display-only, hidden if not printed and not in edit mode) -->
+            {#if ($lq__event_badge_obj.print_count ?? 0) > 0 || $ae_loc.edit_mode}
+                <div class="card p-4 bg-gray-50 dark:bg-gray-800">
+                    <h4 class="font-semibold mb-2 text-center" class:text-sm={!txt_enlarge} class:text-base={txt_enlarge}>Print Status</h4>
+                {#if ($lq__event_badge_obj.print_count ?? 0) === 0}
+                    <p class:text-sm={!txt_enlarge} class:text-base={txt_enlarge}>Not yet printed</p>
+                {:else}
+                    <p class:text-sm={!txt_enlarge} class:text-base={txt_enlarge}>
+                        Printed {$lq__event_badge_obj.print_count}×
+                        {#if $lq__event_badge_obj.print_first_datetime}
+                            — first: {ae_util.iso_datetime_formatter($lq__event_badge_obj.print_first_datetime, 'datetime_iso_12_no_seconds')}
+                        {/if}
+                        {#if $lq__event_badge_obj.print_last_datetime}
+                            , last: {ae_util.iso_datetime_formatter($lq__event_badge_obj.print_last_datetime, 'datetime_iso_12_no_seconds')}
+                        {/if}
+                    </p>
+                {/if}
+                </div>
+            {/if}
+
+
+
+            <!-- Section 2: QR Code -->
+            {#if qr_data_url}
+                <div class="card p-4 flex flex-col items-center">
+                    <h4 class="font-semibold mb-2 w-full text-center" class:text-sm={!txt_enlarge} class:text-base={txt_enlarge}>Badge QR Code</h4>
                     <button
                         type="button"
-                        class="btn preset-tonal-surface"
-                        onclick={handle_cancel}
-                        data-testid="badge-review-cancel-btn"
+                        class="relative cursor-pointer transition-all duration-200 mx-auto"
+                        class:scale-150={qr_hovered && !qr_expanded}
+                        class:z-20={qr_hovered && !qr_expanded}
+                        onclick={() => qr_expanded = !qr_expanded}
+                        onmouseover={() => qr_hovered = true}
+                        onmouseout={() => qr_hovered = false}
+                        onfocus={() => qr_hovered = true}
+                        onblur={() => qr_hovered = false}
+                        title="{qr_expanded ? 'Click to collapse' : 'Hover to preview, click to expand'}"
                     >
-                        Cancel
+                        <img
+                            src={qr_data_url}
+                            alt="Badge QR Code"
+                            class="transition-all duration-200 p-2 bg-white rounded shadow-sm mx-auto block"
+                            class:w-32={!qr_expanded}
+                            class:h-32={!qr_expanded}
+                            class:max-w-md={qr_expanded}
+                            class:w-full={qr_expanded}
+                            class:p-6={qr_expanded}
+                            class:shadow-lg={qr_expanded}
+                        />
                     </button>
-                {/if}
-            </div>
-        {/if}
+                    <p class="text-gray-500 mt-2 text-center" class:text-xs={!txt_enlarge} class:text-sm={txt_enlarge}>
+                        {qr_expanded ? 'Click QR to collapse' : 'Scan or click to enlarge'}
+                    </p>
+                </div>
+            {/if}
 
-        <!-- Print info (read-only) -->
-        {#if is_staff && $lq__event_badge_obj.print_count !== undefined}
-            <div class="text-xs text-gray-500 space-y-0.5 border-t border-gray-200 pt-3 mt-2">
-                <p>Print count: <strong>{$lq__event_badge_obj.print_count ?? 0}</strong></p>
-                {#if $lq__event_badge_obj.print_first_datetime}
-                    <p>First printed: {new Date($lq__event_badge_obj.print_first_datetime).toLocaleString()}</p>
+            <!-- Section 3: Editable Fields -->
+            <div class="card p-4 space-y-4">
+
+                <!-- Pronouns -->
+                {#if can_edit('pronouns_override') || is_staff}
+                    <div class="grid grid-cols-[120px_1fr] gap-4 items-center">
+                        <label for="badge-review-pronouns" class="text-gray-500 uppercase tracking-wide flex items-center gap-1" class:text-xs={!txt_enlarge} class:text-sm={txt_enlarge}>
+                            <User size="12" />
+                            <span>Pronouns</span>
+                            {#if has_override('pronouns', 'pronouns_override')}
+                                <span class="text-[10px] text-amber-600 ml-1">*</span>
+                            {/if}
+                        </label>
+                        <div class="flex items-center gap-2">
+                            {#if local_edit_active && can_edit('pronouns_override')}
+                                <input
+                                    id="badge-review-pronouns"
+                                    type="text"
+                                    class="input w-full"
+                                    class:text-2xl={!txt_enlarge}
+                                    class:text-4xl={txt_enlarge}
+                                    bind:value={editable_pronouns_override}
+                                    placeholder={$lq__event_badge_obj.pronouns ?? 'Pronouns'}
+                                />
+                                {#if has_override('pronouns', 'pronouns_override')}
+                                    <button
+                                        type="button"
+                                        class="btn btn-xs preset-tonal-surface"
+                                        onclick={() => revert_override('pronouns_override')}
+                                        title="{$lq__event_badge_obj.pronouns} was overridden with {$lq__event_badge_obj.pronouns_override}"
+                                    >
+                                        <RotateCcw size="12" />
+                                    </button>
+                                {/if}
+                            {:else}
+                                <div class:text-2xl={!txt_enlarge} class:text-4xl={txt_enlarge}>
+                                    {get_display_value('pronouns', 'pronouns_override') || '—'}
+                                </div>
+                            {/if}
+                        </div>
+                    </div>
                 {/if}
-                {#if $lq__event_badge_obj.print_last_datetime}
-                    <p>Last printed: {new Date($lq__event_badge_obj.print_last_datetime).toLocaleString()}</p>
+
+                <!-- Full Name -->
+                {#if can_edit('full_name_override') || is_staff}
+                    <div class="grid grid-cols-[120px_1fr] gap-4 items-center">
+                        <label for="badge-review-full-name" class="text-gray-500 uppercase tracking-wide flex items-center gap-1" class:text-xs={!txt_enlarge} class:text-sm={txt_enlarge}>
+                            <User size="12" />
+                            <span>Full Name</span>
+                            {#if has_override('full_name', 'full_name_override')}
+                                <span class="text-[10px] text-amber-600 ml-1">*</span>
+                            {/if}
+                        </label>
+                        <div class="flex items-center gap-2">
+                            {#if local_edit_active && can_edit('full_name_override')}
+                                <input
+                                    id="badge-review-full-name"
+                                    data-testid="badge-review-full-name-input"
+                                    type="text"
+                                    class="input w-full font-semibold"
+                                    class:text-2xl={!txt_enlarge}
+                                    class:text-4xl={txt_enlarge}
+                                    bind:value={editable_full_name_override}
+                                    placeholder={$lq__event_badge_obj.full_name ?? 'Full name'}
+                                />
+                                {#if has_override('full_name', 'full_name_override')}
+                                    <button
+                                        type="button"
+                                        class="btn btn-sm preset-tonal-surface p-1"
+                                        onclick={() => revert_override('full_name_override')}
+                                        title="Revert to: {$lq__event_badge_obj.full_name}"
+                                    >
+                                        <RotateCcw size="12" />
+                                    </button>
+                                {/if}
+                            {:else}
+                                <div class="font-semibold" class:text-2xl={!txt_enlarge} class:text-4xl={txt_enlarge}>
+                                    {@html get_display_value('full_name', 'full_name_override') || '—'}
+                                </div>
+                            {/if}
+                        </div>
+                    </div>
+                {/if}
+
+                <!-- Professional Title -->
+                {#if can_edit('professional_title_override') || is_staff}
+                    <div class="grid grid-cols-[120px_1fr] gap-4 items-center">
+                        <label for="badge-review-pro-title" class="text-gray-500 uppercase tracking-wide flex items-center gap-1" class:text-xs={!txt_enlarge} class:text-sm={txt_enlarge}>
+                            <Briefcase size="12" />
+                            <span>Prof. Title</span>
+                            {#if has_override('professional_title', 'professional_title_override')}
+                                <span class="text-[10px] text-amber-600 ml-1">*</span>
+                            {/if}
+                        </label>
+                        <div class="flex items-center gap-2">
+                            {#if local_edit_active && can_edit('professional_title_override')}
+                                <input
+                                    id="badge-review-pro-title"
+                                    type="text"
+                                    class="input w-full"
+                                    class:text-2xl={!txt_enlarge}
+                                    class:text-4xl={txt_enlarge}
+                                    bind:value={editable_professional_title_override}
+                                    placeholder={$lq__event_badge_obj.professional_title ?? 'Professional title'}
+                                />
+                                {#if has_override('professional_title', 'professional_title_override')}
+                                    <button
+                                        type="button"
+                                        class="btn btn-sm preset-tonal-surface p-1"
+                                        onclick={() => revert_override('professional_title_override')}
+                                        title="Revert to: {$lq__event_badge_obj.professional_title}"
+                                    >
+                                        <RotateCcw size="12" />
+                                    </button>
+                                {/if}
+                            {:else}
+                                <div class:text-2xl={!txt_enlarge} class:text-4xl={txt_enlarge}>
+                                    {@html get_display_value('professional_title', 'professional_title_override') || '—'}
+                                </div>
+                            {/if}
+                        </div>
+                    </div>
+                {/if}
+
+                <!-- Affiliations -->
+                {#if can_edit('affiliations_override') || is_staff}
+                    <div class="grid grid-cols-[120px_1fr] gap-4 items-start">
+                        <label for="badge-review-affiliations" class="text-gray-500 uppercase tracking-wide pt-2" class:text-xs={!txt_enlarge} class:text-sm={txt_enlarge}>
+                            <Building size="12" class="inline mr-1" />
+                            Affiliations
+                            {#if has_override('affiliations', 'affiliations_override')}
+                                <span class="text-[10px] text-amber-600 ml-1">*</span>
+                            {/if}
+                        </label>
+                        <div class="flex items-start gap-2">
+                            {#if local_edit_active && can_edit('affiliations_override')}
+                                <textarea
+                                    id="badge-review-affiliations"
+                                    class="textarea w-full"
+                                    class:text-2xl={!txt_enlarge}
+                                    class:text-4xl={txt_enlarge}
+                                    rows="2"
+                                    bind:value={editable_affiliations_override}
+                                    placeholder={$lq__event_badge_obj.affiliations ?? 'Affiliations / organization'}
+                                ></textarea>
+                                {#if has_override('affiliations', 'affiliations_override')}
+                                    <button
+                                        type="button"
+                                        class="btn btn-sm preset-tonal-surface p-1 mt-1"
+                                        onclick={() => revert_override('affiliations_override')}
+                                        title="Revert to: {$lq__event_badge_obj.affiliations}"
+                                    >
+                                        <RotateCcw size="12" />
+                                    </button>
+                                {/if}
+                            {:else}
+                                <div class="whitespace-pre-line" class:text-2xl={!txt_enlarge} class:text-4xl={txt_enlarge}>
+                                    {@html get_display_value('affiliations', 'affiliations_override') || '—'}
+                                </div>
+                            {/if}
+                        </div>
+                    </div>
+                {/if}
+
+                <!-- Phone -->
+                {#if can_edit('phone_override') || is_staff}
+                    <div class="grid grid-cols-[120px_1fr] gap-4 items-center">
+                        <label for="badge-review-phone" class="text-gray-500 uppercase tracking-wide flex items-center gap-1" class:text-xs={!txt_enlarge} class:text-sm={txt_enlarge}>
+                            <Phone size="12" />
+                            <span>Phone</span>
+                            {#if has_override('phone', 'phone_override')}
+                                <span class="text-[10px] text-amber-600 ml-1">*</span>
+                            {/if}
+                        </label>
+                        <div class="flex items-center gap-2">
+                            {#if local_edit_active && can_edit('phone_override')}
+                                <input
+                                    id="badge-review-phone"
+                                    type="tel"
+                                    class="input w-full"
+                                    class:text-2xl={!txt_enlarge}
+                                    class:text-4xl={txt_enlarge}
+                                    bind:value={editable_phone_override}
+                                    placeholder={$lq__event_badge_obj.phone ?? 'Phone number'}
+                                />
+                                {#if has_override('phone', 'phone_override')}
+                                    <button
+                                        type="button"
+                                        class="btn btn-sm preset-tonal-surface p-1"
+                                        onclick={() => revert_override('phone_override')}
+                                        title="Revert to: {$lq__event_badge_obj.phone}"
+                                    >
+                                        <RotateCcw size="12" />
+                                    </button>
+                                {/if}
+                            {:else}
+                                <div class:text-2xl={!txt_enlarge} class:text-4xl={txt_enlarge}>
+                                    {get_display_value('phone', 'phone_override') || '—'}
+                                </div>
+                            {/if}
+                        </div>
+                    </div>
+                {/if}
+
+                <!-- Location -->
+                {#if can_edit('location_override') || is_staff}
+                    <div class="grid grid-cols-[120px_1fr] gap-4 items-center">
+                        <label for="badge-review-location" class="text-gray-500 uppercase tracking-wide flex items-center gap-1" class:text-xs={!txt_enlarge} class:text-sm={txt_enlarge}>
+                            <MapPin size="12" />
+                            <span>Location</span>
+                            {#if has_override('location', 'location_override')}
+                                <span class="text-[10px] text-amber-600 ml-1">*</span>
+                            {/if}
+                        </label>
+                        <div class="flex items-center gap-2">
+                            {#if local_edit_active && can_edit('location_override')}
+                                <input
+                                    id="badge-review-location"
+                                    type="text"
+                                    class="input w-full"
+                                    class:text-2xl={!txt_enlarge}
+                                    class:text-4xl={txt_enlarge}
+                                    bind:value={editable_location_override}
+                                    placeholder={$lq__event_badge_obj.location ?? 'City, State/Province, Country'}
+                                />
+                                {#if has_override('location', 'location_override')}
+                                    <button
+                                        type="button"
+                                        class="btn btn-sm preset-tonal-surface p-1"
+                                        onclick={() => revert_override('location_override')}
+                                        title="Revert to: {$lq__event_badge_obj.location}"
+                                    >
+                                        <RotateCcw size="12" />
+                                    </button>
+                                {/if}
+                            {:else}
+                                <div class:text-2xl={!txt_enlarge} class:text-4xl={txt_enlarge}>
+                                    {@html get_display_value('location', 'location_override') || '—'}
+                                </div>
+                            {/if}
+                        </div>
+                    </div>
+                {/if}
+
+                <!-- Allow Tracking checkbox -->
+                {#if can_edit('allow_tracking')}
+                    <label class="flex items-center gap-2 cursor-pointer">
+                        <input
+                            type="checkbox"
+                            class="checkbox"
+                            bind:checked={editable_allow_tracking}
+                            disabled={!local_edit_active}
+                        />
+                        <Radio size="12" class="text-gray-500" />
+                        <span class:text-sm={!txt_enlarge} class:text-base={txt_enlarge}>Allow exhibitor lead scanning</span>
+                    </label>
+                {/if}
+
+                <!-- Staff-only fields -->
+                {#if is_staff}
+                    <div class="border-t border-gray-300 pt-4 mt-4">
+                        <h5 class="font-semibold mb-3 text-gray-600 text-center" class:text-sm={!txt_enlarge} class:text-base={txt_enlarge}>Staff Only</h5>
+
+                        <!-- Email Override -->
+                        {#if can_edit('email_override') || is_staff}
+                            <div class="grid grid-cols-[140px_1fr] gap-4 items-center">
+                                <div class="flex items-center gap-2">
+                                    <label for="badge-review-email" class="text-xs text-gray-500 uppercase tracking-wide flex items-center gap-1">
+                                        <Mail size="12" />
+                                        <span>Email (override)</span>
+                                    </label>
+                                    {#if has_override('email', 'email_override')}
+                                        <span class="text-xs text-amber-600">(overridden)</span>
+                                    {/if}
+                                </div>
+                                <div class="flex items-center gap-2">
+                                    {#if local_edit_active && can_edit('email_override')}
+                                        <input
+                                            id="badge-review-email"
+                                            type="email"
+                                            class="input w-full text-sm"
+                                            bind:value={editable_email_override}
+                                            placeholder={$lq__event_badge_obj.email ?? 'Email address'}
+                                        />
+                                    {:else}
+                                        <div class="text-sm">
+                                            {get_display_value('email', 'email_override') || '—'}
+                                        </div>
+                                    {/if}
+                                    {#if local_edit_active && can_edit('email_override') && has_override('email', 'email_override')}
+                                        <button
+                                            type="button"
+                                            class="btn btn-xs preset-tonal-surface flex items-center gap-1 shrink-0"
+                                            onclick={() => revert_override('email_override')}
+                                            title="{$lq__event_badge_obj.email} was overridden with {$lq__event_badge_obj.email_override}"
+                                        >
+                                            <RotateCcw size="12" />
+                                            <span class="text-xs">Revert</span>
+                                        </button>
+                                    {/if}
+                                </div>
+                            </div>
+                        {/if}
+
+                        <!-- Badge Type Code Override -->
+                        {#if can_edit('badge_type_code_override')}
+                            <div class="grid grid-cols-[140px_1fr] gap-4 items-center">
+                                <label for="badge-type-code" class="text-xs text-gray-500 uppercase tracking-wide flex items-center gap-1">
+                                    <Tag size="12" />
+                                    <span>Badge Type Code</span>
+                                </label>
+                                <div>
+                                    {#if local_edit_active}
+                                        <select
+                                            id="badge-type-code"
+                                            class="select w-full text-sm"
+                                            bind:value={editable_badge_type_code_override}
+                                        >
+                                            <option value={null}>— Select badge type —</option>
+                                            <option value="member">Member</option>
+                                            <option value="non-member">Non-Member</option>
+                                            <option value="guest">Guest</option>
+                                            <option value="exhibitor">Exhibitor</option>
+                                            <option value="staff">Staff</option>
+                                            <option value="test">Test</option>
+                                        </select>
+                                    {:else}
+                                        <div class="text-sm">
+                                            {$lq__event_badge_obj.badge_type_code_override ?? $lq__event_badge_obj.badge_type_code ?? '—'}
+                                        </div>
+                                    {/if}
+                                </div>
+                            </div>
+                        {/if}
+
+                        <!-- Registration Type Code Override -->
+                        {#if can_edit('registration_type_code_override')}
+                            <div class="grid grid-cols-[140px_1fr] gap-4 items-center">
+                                <label for="reg-type-code" class="text-xs text-gray-500 uppercase tracking-wide flex items-center gap-1">
+                                    <Ticket size="12" />
+                                    <span>Registration Type Code</span>
+                                </label>
+                                <div>
+                                    {#if local_edit_active}
+                                        <select
+                                            id="reg-type-code"
+                                            class="select w-full text-sm"
+                                            bind:value={editable_registration_type_code_override}
+                                        >
+                                            <option value={null}>— Select registration type —</option>
+                                            <option value="member">Member</option>
+                                            <option value="non-member">Non-Member</option>
+                                            <option value="guest">Guest</option>
+                                            <option value="exhibitor">Exhibitor</option>
+                                            <option value="staff">Staff</option>
+                                            <option value="test">Test</option>
+                                        </select>
+                                    {:else}
+                                        <div class="text-sm">
+                                            {$lq__event_badge_obj.registration_type_code_override ?? $lq__event_badge_obj.registration_type_code ?? '—'}
+                                        </div>
+                                    {/if}
+                                </div>
+                            </div>
+                        {/if}
+
+                        <!-- Hide checkbox -->
+                        {#if can_edit('hide')}
+                            <label class="flex items-center gap-2 cursor-pointer">
+                                <input
+                                    type="checkbox"
+                                    class="checkbox"
+                                    bind:checked={editable_hide}
+                                    disabled={!local_edit_active}
+                                />
+                                <EyeOff size="12" class="text-gray-500" />
+                                <span class="text-sm">Hidden from search results</span>
+                            </label>
+                        {/if}
+
+                        <!-- Priority -->
+                        {#if can_edit('priority')}
+                            <div class="grid grid-cols-[140px_1fr] gap-4 items-center">
+                                <label for="priority" class="text-xs text-gray-500 uppercase tracking-wide flex items-center gap-1">
+                                    <Flag size="12" />
+                                    <span>Priority</span>
+                                </label>
+                                <div>
+                                    {#if local_edit_active}
+                                        <input
+                                            id="priority"
+                                            type="number"
+                                            class="input w-full text-sm"
+                                            bind:value={editable_priority}
+                                        />
+                                    {:else}
+                                        <div class="text-sm">
+                                            {$lq__event_badge_obj.priority ?? '—'}
+                                        </div>
+                                    {/if}
+                                </div>
+                            </div>
+                        {/if}
+
+                        <!-- Notes -->
+                        {#if can_edit('notes')}
+                            <div class="grid grid-cols-[140px_1fr] gap-4 items-start">
+                                <label for="notes" class="text-xs text-gray-500 uppercase tracking-wide pt-2">
+                                    <FileText size="12" class="inline mr-1" />
+                                    Notes
+                                </label>
+                                <div>
+                                    {#if local_edit_active}
+                                        <textarea
+                                            id="notes"
+                                            class="textarea w-full text-sm"
+                                            rows="3"
+                                            bind:value={editable_notes}
+                                        ></textarea>
+                                    {:else}
+                                        <div class="text-sm">
+                                            {$lq__event_badge_obj.notes ?? '—'}
+                                        </div>
+                                    {/if}
+                                </div>
+                            </div>
+                        {/if}
+
+                        <!-- Options (other_1 through other_8) -->
+                        <div class="mt-4">
+                            <h6 class="font-semibold mb-2 text-gray-500 uppercase text-center" class:text-xs={!txt_enlarge} class:text-sm={txt_enlarge}>Options</h6>
+                            <div class="grid grid-cols-2 gap-2">
+                                {#each [1, 2, 3, 4, 5, 6, 7, 8] as idx}
+                                    {#if ($lq__event_badge_obj[`other_${idx}_code`] || local_edit_active)}
+                                        <div class="space-y-1">
+                                            <label class="block text-xs text-gray-500">Option {idx}</label>
+                                            {#if local_edit_active}
+                                                <input
+                                                    type="text"
+                                                    class="input input-sm w-full"
+                                                    value={get_option_code(idx) ?? ''}
+                                                    oninput={(e) => set_option_code(idx, e.currentTarget.value || null)}
+                                                    placeholder="—"
+                                                />
+                                            {:else}
+                                                <div class="text-sm">
+                                                    {#if $lq__event_badge_obj[`other_${idx}_code`]}
+                                                        <Check size="14" class="inline text-success-500" /> {$lq__event_badge_obj[`other_${idx}_code`]}
+                                                    {:else}
+                                                        <span class="text-gray-400 text-xs italic">(empty)</span>
+                                                    {/if}
+                                                </div>
+                                            {/if}
+                                        </div>
+                                    {/if}
+                                {/each}
+                            </div>
+                        </div>
+
+                        <!-- Tickets (ticket_1 through ticket_8) -->
+                        <div class="mt-4">
+                            <h6 class="font-semibold mb-2 text-gray-500 uppercase text-center" class:text-xs={!txt_enlarge} class:text-sm={txt_enlarge}>Tickets</h6>
+                            <div class="grid grid-cols-2 gap-2">
+                                {#each [1, 2, 3, 4, 5, 6, 7, 8] as idx}
+                                    {#if ($lq__event_badge_obj[`ticket_${idx}_code`] || local_edit_active)}
+                                        <div class="space-y-1">
+                                            <label class="block text-xs text-gray-500">Ticket {idx}</label>
+                                            {#if local_edit_active}
+                                                <input
+                                                    type="text"
+                                                    class="input input-sm w-full"
+                                                    value={get_ticket_code(idx) ?? ''}
+                                                    oninput={(e) => set_ticket_code(idx, e.currentTarget.value || null)}
+                                                    placeholder="—"
+                                                />
+                                            {:else}
+                                                <div class="text-sm">
+                                                    {#if $lq__event_badge_obj[`ticket_${idx}_code`]}
+                                                        <Check size="14" class="inline text-success-500" /> {$lq__event_badge_obj[`ticket_${idx}_code`]}
+                                                    {:else}
+                                                        <span class="text-gray-400 text-xs italic">(empty)</span>
+                                                    {/if}
+                                                </div>
+                                            {/if}
+                                        </div>
+                                    {/if}
+                                {/each}
+                            </div>
+                        </div>
+                    </div>
+                {/if}
+
+                <!-- Attendee-only: Options & Tickets (display only) -->
+                {#if !is_staff}
+                    {#each [1, 2, 3, 4, 5, 6, 7, 8] as idx}
+                        {#if $lq__event_badge_obj[`other_${idx}_code`]}
+                            <div class="text-sm">
+                                <Check size="14" class="inline text-success-500" /> Option {idx}: {$lq__event_badge_obj[`other_${idx}_code`]}
+                            </div>
+                        {/if}
+                    {/each}
+                    {#each [1, 2, 3, 4, 5, 6, 7, 8] as idx}
+                        {#if $lq__event_badge_obj[`ticket_${idx}_code`]}
+                            <div class="text-sm">
+                                <Check size="14" class="inline text-success-500" /> Ticket {idx}: {$lq__event_badge_obj[`ticket_${idx}_code`]}
+                            </div>
+                        {/if}
+                    {/each}
+                {/if}
+
+                <!-- Terms & Conditions -->
+                {#if can_edit('agree_to_tc')}
+                    <div class="border-t border-gray-300 pt-4 mt-4">
+                        <label class="flex flex-col gap-2">
+                            <div class="flex items-center gap-2 cursor-pointer">
+                                <input
+                                    type="checkbox"
+                                    class="checkbox"
+                                    bind:checked={editable_agree_to_tc}
+                                    disabled={!local_edit_active}
+                                />
+                                <FileCheck size="12" class="text-gray-500" />
+                                <span class="text-sm font-medium">I agree to the Terms and Conditions</span>
+                            </div>
+                            <div class="text-xs text-gray-600 ml-6 p-3 bg-gray-50 dark:bg-gray-800 rounded">
+                                <p>
+                                    By checking this box, I confirm that the information on my badge is correct to the best
+                                    of my knowledge. I agree that this badge may be used for identification purposes during
+                                    the event and that my attendance may be recorded by exhibitors using the lead scanning
+                                    feature if I permit it.
+                                </p>
+                            </div>
+                        </label>
+                    </div>
                 {/if}
             </div>
-        {/if}
+
+            <!-- Bottom padding (buttons moved to sticky header) -->
+            <div class="pb-4"></div>
+        </div>
     </div>
+
+    <!-- Help Modal -->
+    <Modal
+        title="Badge Review Help"
+        bind:open={help_modal_open}
+        autoclose={false}
+        size="xl"
+        placement="top-center"
+        class="w-full"
+    >
+        <div class="space-y-4 text-base">
+            <!-- NOTE: This will largely be replaced by the AE Data Store element to populate correctly per client Event. -->
+            <section>
+                <h4 class="font-semibold text-lg mb-2">Reviewing Your Badge</h4>
+                <p class="text-gray-700 dark:text-gray-300">
+                    This page allows you to review and update the information that will appear on your event badge.
+                    Please verify that all details are correct before your badge is printed.
+                </p>
+            </section>
+
+            <section>
+                <h4 class="font-semibold text-lg mb-2">Editing Your Information</h4>
+                <p class="text-gray-700 dark:text-gray-300 mb-2">
+                    Click the <strong>"Edit Details"</strong> button to make changes to your badge information.
+                    You can update fields like your name, professional title, affiliations, and location.
+                </p>
+                <p class="text-gray-700 dark:text-gray-300">
+                    When you're done editing, click <strong>"Save"</strong> to submit your changes, or <strong>"Cancel"</strong> to discard them.
+                </p>
+            </section>
+
+            <section>
+                <h4 class="font-semibold text-lg mb-2">Accessibility</h4>
+                <p class="text-gray-700 dark:text-gray-300">
+                    Use the <strong>"Larger"</strong> button to increase text size for easier reading.
+                    Click again to return to normal size.
+                </p>
+            </section>
+
+            <section>
+                <h4 class="font-semibold text-lg mb-2">QR Code</h4>
+                <p class="text-gray-700 dark:text-gray-300">
+                    Your badge QR code can be scanned at the event for check-in and registration.
+                    You can hover over or click the QR code to view it larger.
+                </p>
+            </section>
+
+            <section>
+                <h4 class="font-semibold text-lg mb-2">Lead Scanning</h4>
+                <p class="text-gray-700 dark:text-gray-300">
+                    If you check <strong>"Allow exhibitor lead scanning"</strong>, exhibitors will be able to scan
+                    your badge to collect your contact information. You can change this setting at any time.
+                </p>
+            </section>
+
+            <section>
+                <h4 class="font-semibold text-lg mb-2">Need Assistance?</h4>
+                <p class="text-gray-700 dark:text-gray-300">
+                    If you have questions or need help with your badge information, please contact event staff
+                    at the registration desk.
+                </p>
+            </section>
+        </div>
+
+        <div class="modal-action flex items-center justify-center w-full">
+            <button
+                type="button"
+                class="btn btn-lg preset-filled-primary preset-outlined-primary-100-900"
+                onclick={() => help_modal_open = false}
+            >
+                Got It
+            </button>
+        </div>
+    </Modal>
 {/if}