diff --git a/_layouts/default.html b/_layouts/default.html
index 2d8abf3..cb8ebb3 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -65,7 +65,7 @@
     gtag('js', new Date());
     gtag('config','G-FKVXD8061R',{ send_page_view:true });
   </script>
-<link rel="stylesheet" href="{{ '/assets/css/style.css?v=2' | relative_url }}">
+ <link rel="stylesheet" href="{{ '/assets/css/style.css?v=2' | relative_url }}">
 {% if page.custom_css %}
 <link rel="stylesheet" href="{{ page.custom_css | relative_url }}">
 {% endif %}
@@ -79,7 +79,21 @@
                  style-src 'self' 'unsafe-inline'">
 {% endif %}
 
- 
+{% if page.url contains '/order-helper/' %}
+  <!-- Relaxed CSP for Order Helper so it can load Firebase + Firestore -->
+  <meta http-equiv="Content-Security-Policy"
+        content="default-src 'self';
+                 script-src 'self' https://www.gstatic.com 'unsafe-inline';
+                 connect-src 'self' https://firestore.googleapis.com;
+                 img-src 'self' data:;
+                 style-src 'self' 'unsafe-inline'">
+
+  <!-- Order Helper styles + meta for rules + cache-busting -->
+  <link rel="stylesheet" href="{{ '/order-helper/style.css' | relative_url }}?v=20250919">
+  <meta name="oh-rules-path" content="{{ '/order-helper/data/rules.json' | relative_url }}?v=20250919">
+  <meta name="oh-version" content="20250919">
+{% endif %}
+
 </head>
 <body>
   <!-- 4) Google Tag Manager (noscript fallback) -->
diff --git a/order-helper/app.js b/order-helper/app.js
index 2ca2150..0eebf3b 100644
--- a/order-helper/app.js
+++ b/order-helper/app.js
@@ -1,716 +1,246 @@
-<!-- /order-helper/app.js -->
-<script>
-/* =========================================================
-   OraDigit Order Helper v2 — app.js
-   - Robust rules loader (meta-config + local JSON; optional Firestore overlay)
-   - Populates all dropdowns (CT/MRI/PET-CT/US/XR/…)
-   - Live Order Review builder
-   - Suggest Reason, Copy, Share, Reset
-   - Optional Firebase write on submit (orders collection)
-   - Defensive error handling with status beacons + debug panel
-   - STEP 4: Merge modality ICD-10 into global catalog + auto-select first modality
-========================================================= */
-
 (() => {
-  // ---------- App version (used for cache-busting) ----------
-  const APP_VERSION = document.querySelector('meta[name="oh-version"]')?.content || String(Date.now());
-
-  // ---------- Shorthands & elements ----------
-  const $ = (s) => document.querySelector(s);
-  const els = {
-    form: $('#orderForm'),
-    status: $('#status'),
-    review: $('#review'),
-    btnSuggest: $('#btnSuggest'),
-    btnCopy: $('#btnCopy'),
-    btnShare: $('#btnShare'),
-    btnReset: $('#btnReset'),
-    modality: $('#modality'),
-    region: $('#region'),
-    bodyPart: $('#bodyPart'),
-    contrast: $('#contrast'),
-    laterality: $('#laterality'),
-    context: $('#context'),
-    urgency: $('#urgency'),
-    condition: $('#condition'),
-    conditionList: $('#conditionList'),
-    icd10: $('#icd10'),
-    icdList: $('#icdList'),
-    cpt: $('#cpt'),
-    indication: $('#indication'),
-    pregnant: $('#pregnant'),
-    creatinineDate: $('#creatinineDate'),
-    allergies: $('#allergies'),
-    special: $('#special'),
+  const qs = (s) => document.querySelector(s);
+  const setStatus = (msg, cls = 'status success') => {
+    const s = qs('#status'); if (s) { s.textContent = msg; s.className = cls; }
   };
 
-  // ---------- Status beacons ----------
-  function setStatus(msg, cls = 'oh-status success', persist = true) {
-    if (!els.status) return;
-    els.status.textContent = msg;
-    els.status.className = cls;
-    if (!persist) {
-      setTimeout(() => {
-        if (els.status.textContent === msg) {
-          els.status.textContent = 'Ready.';
-          els.status.className = 'oh-status';
-        }
-      }, 4000);
-    }
-    const tag = cls.includes('error') ? 'error' : cls.includes('warn') ? 'warn' : 'log';
-    console[tag](`[OH] ${msg}`);
-  }
+  // Catch sync + async errors in one place
+  window.addEventListener('error', e => setStatus('JavaScript error: ' + (e.message || 'Unknown'), 'status error'));
+  window.addEventListener('unhandledrejection', e => setStatus('App error: ' + (e.reason?.message || e.reason || 'Unknown'), 'status error'));
 
-  // Catch sync + async errors globally
-  window.addEventListener('error', e =>
-    setStatus('JavaScript error: ' + (e.message || 'Unknown'), 'oh-status error')
-  );
-  window.addEventListener('unhandledrejection', e =>
-    setStatus('App error: ' + (e.reason?.message || e.reason || 'Unknown'), 'oh-status error')
-  );
-
-  // ---------- State ----------
-  const state = { rules: null, rulesSource: '' };
-
-  // ---------- Init ----------
   document.addEventListener('DOMContentLoaded', init);
 
-  async function init () {
+  async function init() {
     try {
-      await loadRules();         // populates state.rules & state.rulesSource
-      ensureMinimumModalities(); // guard: UI never empty even if rules sparse
-      populateModalities();      // now also auto-selects first modality
-      wireEvents();
-      buildReview();
-      attachDebugPanel();
-
-      // If URL has hash payload (from share fallback), hydrate review
-      if (location.hash && els.review) {
-        const txt = decodeURIComponent(location.hash.slice(1));
-        els.review.textContent = txt;
-      }
-      setStatus(`Rules ready from ${state.rulesSource}`, 'oh-status success');
-    } catch (e) {
-      console.error(e);
-      setStatus('Failed to initialize Order Helper.', 'oh-status error');
-    }
-  }
-
-  // ---------- Cache-busting + safe JSON fetch ----------
-  function cacheUrl(url) {
-    try {
-      const u = new URL(url, window.location.origin);
-      if (!u.searchParams.has('v')) u.searchParams.set('v', APP_VERSION);
-      return u.toString();
-    } catch {
-      return url + (url.includes('?') ? '&' : '?') + 'v=' + encodeURIComponent(APP_VERSION);
-    }
-  }
-
-  async function fetchJSON(url) {
-    try {
-      const r = await fetch(cacheUrl(url), { cache: 'no-store' });
-      if (!r.ok) return null;
-      return await r.json();
-    } catch {
-      return null;
-    }
-  }
-
-  // ---------- Rules loading ----------
-  async function loadRules () {
-    setStatus('Loading rules…', 'oh-status');
-
-    let source = null;
-    const metaPath = document.querySelector('meta[name="oh-rules-path"]')?.content;
-    const tryPaths = [
-      metaPath,
-      '/order-helper/data/rules.json',
-      './data/rules.json',
-      'data/rules.json'
-    ].filter(Boolean);
-
-    // 1) Primary rules.json attempts
-    let base = null;
-    for (const p of tryPaths) {
-      const data = await fetchJSON(p);
-      if (data && (data.modalities || data.CT || data.MRI)) {
-        base = data; source = p; break;
-      }
-    }
-
-    // 2) Legacy split files (ct_rules.json / mri_rules.json)
-    if (!base) {
-      const ct  = await fetchJSON('/order-helper/data/ct_rules.json')
-              || await fetchJSON('./data/ct_rules.json')
-              || await fetchJSON('data/ct_rules.json');
-      const mri = await fetchJSON('/order-helper/data/mri_rules.json')
-              || await fetchJSON('./data/mri_rules.json')
-              || await fetchJSON('data/mri_rules.json');
-      if (ct || mri) {
-        base = { modalities: {} };
-        if (ct)  base.modalities['CT']  = ct.modalities?.CT  || ct.CT  || ct;
-        if (mri) base.modalities['MRI'] = mri.modalities?.MRI || mri.MRI || mri;
-        source = 'legacy ct_rules.json + mri_rules.json';
-      }
-    }
-
-    // 3) Embedded emergency defaults (UI never empty)
-    if (!base) {
-      console.warn('[OH] No rules file found; using embedded defaults.');
-      base = {
-        modalities: {
-          'CT': {
-            regions: ['Head/Brain', 'Chest', 'Abdomen/Pelvis'],
-            body_parts: ['Brain', 'Thorax', 'Abdomen and pelvis'],
-            contrast_options: ['None','With contrast','Without contrast','With and without'],
-            contexts: ['Acute','Oncology staging','Follow-up'],
-            conditions: ['Stroke/TIA','Lung nodule','RLQ pain/appendicitis'],
-            common_cpt: ['70450','71260','74177'],
-            cpt_map: {
-              'Head/Brain | Brain | Without contrast': ['70450'],
-              'Chest | Thorax | With contrast': ['71260'],
-              'Abdomen/Pelvis | Abdomen and pelvis | With contrast': ['74177']
-            },
-            icd10: ['I63.9','R91.1','R10.31'] // seed
-          },
-          'MRI': {
-            regions: ['Brain','Lumbar spine','Prostate (PI-RADS)'],
-            body_parts: ['Brain','Lumbar spine','Prostate'],
-            contrast_options: ['None','With and without'],
-            contexts: ['Problem solving','Staging','Follow-up'],
-            conditions: ['Tumor','Radiculopathy','Prostate cancer'],
-            common_cpt: ['70553','72148','72197'],
-            cpt_map: {
-              'Brain | Brain | With and without': ['70553'],
-              'Lumbar spine | Lumbar spine | Without contrast': ['72148'],
-              'Prostate (PI-RADS) | Prostate | With and without': ['72197']
-            },
-            icd10: ['C61','G35'] // seed
-          }
-        },
-        icd10_catalog: ['I63.9','R91.1','R10.31','C61','G35']
-      };
-      source = 'embedded defaults';
-    }
-
-    // 4) Facility overlay (optional)
-    const facility =
-        await fetchJSON('/order-helper/data/rules.facility.json')
-     || await fetchJSON('./data/rules.facility.json')
-     || await fetchJSON('data/rules.facility.json');
-    if (facility) {
-      base = mergeRules(base, facility);
-      source += ' + facility overlay';
-    }
+      // 1) Load rules.json from the meta tag (case-safe)
+      const rulesPath = document.querySelector('meta[name="oh-rules-path"]')?.content;
+      let rules = null;
+      try {
+        const r = await fetch(rulesPath, { cache: 'no-store' });
+        if (r.ok) rules = await r.json();
+      } catch (_) { /* fall through to defaults */ }
+      if (!rules) { rules = defaultRules(); setStatus('Using built-in defaults (rules.json not found).', 'status warn'); }
 
-    // 5) Optional Firestore overlay
-    const overlaid = await overlayRemoteRules(base).catch(err => {
-      console.warn('[OH] Remote overlay failed:', err);
-      return base;
-    });
-    if (overlaid !== base) source += ' + remote overlay';
+      // 2) Normalize rules into a simple catalog
+      const catalog = normalizeRules(rules);
 
-    // 6) Normalize to app schema (includes STEP 4 ICD-10 merge)
-    state.rules = normalizeRules(overlaid);
-    state.rulesSource = source || 'unknown';
+      // 3) Build the UI + wire events
+      buildUI(catalog);
 
-    // 7) Sanity guard
-    if (!state.rules || !state.rules.modalities || !Object.keys(state.rules.modalities).length) {
-      await loadRulesFallback();
-      state.rulesSource = 'emergency defaults';
+      setStatus('Rules loaded.');
+    } catch (e) {
+      setStatus('Init failed: ' + e.message, 'status error');
     }
-
-    const mods = Object.keys(state.rules.modalities || {});
-    setStatus(`Rules ready from ${state.rulesSource} — ${mods.length} modalities.`, 'oh-status success');
   }
 
-  // Last-resort fallback
-  async function loadRulesFallback() {
-    state.rules = {
+  // ---------- Rules handling ----------
+  function defaultRules() {
+    return {
       modalities: {
-        'CT': {
-          regions: ['Head/Brain'],
-          body_parts: ['Brain'],
-          contrast_options: ['Without contrast'],
-          contexts: ['Acute'],
-          conditions: ['Stroke/TIA'],
-          common_cpt: ['70450'],
-          cpt_map: { 'Head/Brain | Brain | Without contrast': ['70450'] },
-          icd10: ['I63.9']
+        "PET/CT": {
+          regions: ["Skull base to mid-thigh","Whole body","Brain","Head/Neck","Chest","Abdomen/Pelvis"],
+          contexts: ["Staging","Restaging","Treatment response","Surveillance","Suspected recurrence","Infection / inflammation","Viability"],
+          conditions: ["NSCLC","Lymphoma","Colorectal cancer","Melanoma","Head & neck cancer"]
+        },
+        "CT": {
+          regions: ["Head","Neck","Chest","Abdomen","Pelvis","Abdomen/Pelvis","Angio chest (PE)"],
+          contexts: ["Acute","Chronic","Follow-up"],
+          conditions: ["Renal colic","PE","Appendicitis","Pancreatitis"]
+        },
+        "MRI": {
+          regions: ["Brain","Cervical spine","Thoracic spine","Lumbar spine","Abdomen","Pelvis"],
+          contexts: ["Acute","Follow-up","Problem solving"],
+          conditions: ["MS","Seizure","Stroke","Back pain","Prostate cancer"]
         }
-      },
-      icd10_catalog: ['I63.9']
+      }
     };
-    setStatus('Using emergency defaults. Please fix rules.json path/schema.', 'oh-status warn');
   }
 
-  // Optional: overlay from Firestore (if configured globally)
-  async function overlayRemoteRules (local) {
-    if (!(window.ORADIGIT_FIREBASE_CONFIG && window.firebase)) return local;
-    const app = firebase.apps?.length ? firebase.app() : firebase.initializeApp(window.ORADIGIT_FIREBASE_CONFIG);
-    const db = firebase.firestore();
-    const snap = await db.collection('order_helper_rules').doc('current').get();
-    if (!snap.exists) return local;
-    const remote = snap.data() || {};
-    return mergeRules(local, remote);
-  }
-
-  // Conservative deep merge for fields we use
-  function mergeRules (base, overlay) {
-    const out = JSON.parse(JSON.stringify(base || {}));
-    if (!overlay) return out;
-    if (overlay.modalities) {
-      out.modalities = { ...(out.modalities || {}), ...overlay.modalities };
-    }
-    if (Array.isArray(overlay.icd10_catalog)) {
-      const set = new Set([...(out.icd10_catalog || []), ...overlay.icd10_catalog]);
-      out.icd10_catalog = [...set];
-    }
-    return out;
-  }
-
-  // Normalize to a stable shape the UI expects
-  // STEP 4: while normalizing, also fold each modality's icd10 list into the global catalog (de-dupe)
-  function normalizeRules (r) {
-    const src = r?.modalities ? r.modalities : r || {};
-    const globalIcdSet = new Set(Array.isArray(r?.icd10_catalog) ? r.icd10_catalog : []);
-    const out = { modalities: {} , icd10_catalog: [] };
-
-    for (const [mod, specRaw] of Object.entries(src || {})) {
-      if (!specRaw) continue;
-      const spec = { ...specRaw };
-
-      const regions    = arr(spec.regions);
-      const body_parts = arr(spec.body_parts);
-      const contrast   = arr(spec.contrast_options, ['None','With contrast','Without contrast','With and without']);
-      const laterality = arr(spec.laterality, ['N/A','Left','Right','Bilateral']);
-      const contexts   = arr(spec.contexts, ['Staging','Restaging','Treatment response','Surveillance','Screening','Acute']);
-      const conditions = arr(spec.conditions);
-      const icd10      = arr(spec.icd10);
-      const common_cpt = arr(spec.common_cpt);
-      const cpt_map    = spec.cpt_map && typeof spec.cpt_map === 'object' ? spec.cpt_map : {};
-
-      // STEP 4: merge per-modality ICD-10 into global set
-      icd10.forEach(code => code && globalIcdSet.add(code));
+  function normalizeRules(r) {
+    // Accept either {modalities:{...}} or top-level { "PET/CT": {...}, ... }
+    const src = r.modalities ? r.modalities : { "PET/CT": r["PET/CT"], "CT": r["CT"], "MRI": r["MRI"] };
+    const out = { modalities: {} };
 
+    for (const [mod, spec] of Object.entries(src || {})) {
+      if (!spec) continue;
+      const regions = Array.isArray(spec.regions) ? spec.regions
+                    : Array.isArray(spec?.regions?.list) ? spec.regions.list
+                    : Object.keys(spec.regions || {});
+      const contexts = spec.contexts || spec.context || ["Staging","Restaging","Treatment response","Surveillance","Suspected recurrence"];
+      const conditions = spec.conditions || spec.condition || [];
       out.modalities[mod] = {
-        regions, body_parts,
-        contrast_options: contrast,
-        laterality, contexts, conditions, icd10,
-        common_cpt, cpt_map
+        regions: [...new Set(regions)].filter(Boolean),
+        contexts: [...new Set(contexts)].filter(Boolean),
+        conditions: [...new Set(conditions)].filter(Boolean),
       };
     }
-
-    out.icd10_catalog = [...globalIcdSet];
     return out;
-
-    function arr (x, fallback = []) {
-      if (Array.isArray(x)) return x.filter(Boolean);
-      if (x && Array.isArray(x.list)) return x.list.filter(Boolean);
-      return fallback.slice();
-    }
   }
 
-  // Ensure we always have at least baseline modality specs
-  function ensureMinimumModalities() {
-    const base = state.rules?.modalities || {};
-    const inject = (name, spec) => {
-      if (!base[name] || !Object.keys(base[name]).length) base[name] = spec;
-    };
-    inject('CT', {
-      regions: ['Head/Brain','Chest','Abdomen/Pelvis'],
-      body_parts: ['Brain','Thorax','Abdomen and pelvis'],
-      contrast_options: ['None','With contrast','Without contrast','With and without'],
-      contexts: ['Acute','Oncology staging','Follow-up'],
-      conditions: ['Stroke/TIA','Lung nodule','RLQ pain/appendicitis'],
-      common_cpt: ['70450','71260','74177'],
-      cpt_map: {
-        'Head/Brain | Brain | Without contrast': ['70450'],
-        'Chest | Thorax | With contrast': ['71260'],
-        'Abdomen/Pelvis | Abdomen and pelvis | With contrast': ['74177']
-      },
-      icd10: ['I63.9','R91.1','R10.31']
-    });
-    inject('MRI', {
-      regions: ['Brain','Cervical spine','Thoracic spine','Lumbar spine','Prostate (PI-RADS)'],
-      body_parts: ['Brain','Cervical spine','Thoracic spine','Lumbar spine','Prostate'],
-      contrast_options: ['None','With and without','With contrast','Without contrast'],
-      contexts: ['Problem solving','Staging','Follow-up','Acute'],
-      conditions: ['Tumor','MS','Seizure','Radiculopathy','Prostate cancer'],
-      common_cpt: ['70553','72141','72146','72148','72197'],
-      cpt_map: {
-        'Brain | Brain | With and without': ['70553'],
-        'Lumbar spine | Lumbar spine | Without contrast': ['72148'],
-        'Cervical spine | Cervical spine | Without contrast': ['72141'],
-        'Thoracic spine | Thoracic spine | Without contrast': ['72146'],
-        'Prostate (PI-RADS) | Prostate | With and without': ['72197']
-      },
-      icd10: ['C61','G35']
-    });
-    inject('PET/CT', {
-      regions: ['Skull base to mid-thigh','Whole body','Brain'],
-      body_parts: ['Skull base to mid-thigh','Whole body','Brain'],
-      contrast_options: ['None'],
-      contexts: ['Staging','Restaging','Treatment response','Surveillance'],
-      conditions: ['NSCLC','Lymphoma','Colorectal cancer','Melanoma','Head & neck'],
-      common_cpt: ['78815','78816'],
-      cpt_map: { 'Skull base to mid-thigh | Skull base to mid-thigh | None': ['78815'] },
-      icd10: ['C34.90','C83.30']
-    });
-    inject('Ultrasound', {
-      regions: ['Abdomen','Pelvis','Carotid (bilateral)','LE Venous (bilateral)'],
-      body_parts: ['Abdomen','Pelvis','Carotid arteries','LE veins'],
-      contrast_options: ['None'],
-      contexts: ['Initial evaluation','Follow-up','Screening'],
-      conditions: ['RUQ pain','AUB','DVT','TIA'],
-      common_cpt: ['76700','76856','93880','93970'],
-      icd10: ['R10.11','I82.4Z3']
-    });
-    inject('X-Ray', {
-      regions: ['Chest','Abdomen (KUB)','Pelvis','Cervical spine','Thoracic spine','Lumbar spine','Upper extremity','Lower extremity'],
-      body_parts: ['Chest','Abdomen','Pelvis','Cervical spine','Thoracic spine','Lumbar spine','Upper extremity','Lower extremity'],
-      contrast_options: ['None'],
-      contexts: ['Acute','Trauma','Follow-up','Infection'],
-      conditions: ['Fracture','Pneumonia','Effusion','Osteomyelitis'],
-      common_cpt: ['71046','74018'],
-      icd10: ['T14.90XA','J18.9']
-    });
-    state.rules.modalities = base;
+  // ---------- UI wiring ----------
+  function buildUI(cat) {
+    const modalitySel = qs('#modality');
+    const regionSel   = qs('#region');
+    const ctxChips    = qs('#contextChips');
+    const ctxSelect   = qs('#context');          // hidden <select multiple>
+    const conditionIn = qs('#condition');
+    const conditionDL = qs('#conditionList');
+    const contrastGrp = qs('#contrastGroup');
+
+    const clear = (el) => { while (el && el.firstChild) el.removeChild(el.firstChild); };
+    const makeOpt = (v, t = v) => { const o = document.createElement('option'); o.value = v; o.textContent = t; return o; };
+
+    function renderForMod(mod) {
+      const spec = cat.modalities[mod] || { regions: [], contexts: [], conditions: [] };
+
+      // Regions
+      clear(regionSel);
+      regionSel.append(makeOpt('', 'Select region…'));
+      (spec.regions || []).forEach(r => regionSel.append(makeOpt(r)));
+
+      // Context chips + hidden select
+      clear(ctxChips); clear(ctxSelect);
+      (spec.contexts || []).forEach(label => {
+        const opt = makeOpt(label); opt.selected = false; ctxSelect.append(opt);
+
+        const b = document.createElement('button');
+        b.type = 'button';
+        b.className = 'chip';
+        b.textContent = label;
+        b.setAttribute('aria-pressed', 'false');
+        b.addEventListener('click', () => {
+          b.classList.toggle('active');
+          const on = b.classList.contains('active');
+          b.setAttribute('aria-pressed', on ? 'true' : 'false');
+          opt.selected = on;
+          syncPreview();
+        });
+        ctxChips.append(b);
+      });
 
-    // also ensure global catalog includes these (in case normalizeRules ran earlier without them)
-    const set = new Set(state.rules.icd10_catalog || []);
-    Object.values(base).forEach(m => (m.icd10 || []).forEach(code => code && set.add(code)));
-    state.rules.icd10_catalog = [...set];
-  }
+      // Conditions datalist
+      clear(conditionDL);
+      (spec.conditions || []).forEach(c => {
+        const o = document.createElement('option'); o.value = c; conditionDL.append(o);
+      });
 
-  // ---------- UI population ----------
-  function populateModalities () {
-    const mods = Object.keys(state.rules.modalities || {});
-    els.modality.innerHTML = optionize(mods, 'Select modality');
+      // Contrast visibility
+      if (mod === 'CT') { contrastGrp?.classList.remove('hidden'); }
+      else { contrastGrp?.classList.add('hidden'); }
 
-    // Auto-select first modality to ensure dependent selects populate (STEP 4)
-    if (mods.length) {
-      // If nothing selected or previous value missing, pick first
-      if (!els.modality.value || !mods.includes(els.modality.value)) {
-        els.modality.value = mods[0];
-      }
-      populateForModality(els.modality.value);
-      buildReview();
+      // Reset values for new modality
+      regionSel.value = '';
+      conditionIn.value = '';
+      [...ctxSelect.options].forEach(o => o.selected = false);
+      [...ctxChips.querySelectorAll('.chip')].forEach(b => { b.classList.remove('active'); b.setAttribute('aria-pressed','false'); });
+
+      syncPreview();
     }
-  }
 
-  function populateForModality (mod) {
-    const m = state.rules.modalities[mod] || {};
-    els.region.innerHTML     = optionize(m.regions, 'Select region');
-    els.bodyPart.innerHTML   = optionize(m.body_parts, 'Select body part');
-    els.contrast.innerHTML   = optionize(m.contrast_options || ['None'], 'Select contrast');
-    els.laterality.innerHTML = optionize(m.laterality || ['N/A','Left','Right','Bilateral'], 'Select laterality');
-    els.context.innerHTML    = optionize(m.contexts || ['Staging','Restaging','Treatment response','Surveillance'], 'Select context');
-
-    // Datalists
-    // Merge global + per-modality ICD-10 (STEP 4 already merged globally, but keep per-modality first for convenience)
-    const mergedICD = [...new Set([...(m.icd10 || []), ...(state.rules.icd10_catalog || [])])];
-    renderDatalist(els.icdList, mergedICD);
-    renderDatalist(els.conditionList, m.conditions || []);
-
-    // Seed CPT with common until we can compute from selections
-    els.cpt.innerHTML = optionize(m.common_cpt || [], 'Suggested CPT');
-  }
+    // Event wiring
+    modalitySel.addEventListener('change', e => renderForMod(e.target.value));
+    regionSel.addEventListener('change', syncPreview);
+    conditionIn.addEventListener('input', syncPreview);
+    document.querySelectorAll('input[name="contrast"],#oralContrast').forEach(i => i.addEventListener('change', syncPreview));
+    qs('#indication')?.addEventListener('input', syncPreview);
 
-  function optionize (arr, placeholder) {
-    const opts = (arr || []).map(v => `<option value="${escapeHtml(v)}">${escapeHtml(v)}</option>`).join('');
-    return `<option value="" disabled selected>${escapeHtml(placeholder)}</option>${opts}`;
-  }
+    // Suggest Order → computes a simple recommendation & fills results
+    qs('#orderForm')?.addEventListener('submit', e => {
+      e.preventDefault();
+      suggestStudy();
+    });
 
-  function renderDatalist (node, arr) {
-    if (!node) return;
-    node.innerHTML = (arr || []).map(v => `<option value="${escapeHtml(v)}"></option>`).join('');
-  }
+    // Copy indication
+    qs('#copyIndication')?.addEventListener('click', async () => {
+      const txt = qs('#indication')?.value?.trim();
+      if (!txt) return;
+      try { await navigator.clipboard.writeText(txt); setStatus('Clinical indication copied.'); }
+      catch { setStatus('Unable to copy. Please copy manually.', 'status warn'); }
+    });
 
-  function escapeHtml (s = '') {
-    return s.replace(/[&<>\"']/g, m => ({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[m]));
+    // First render
+    renderForMod(modalitySel.value || 'PET/CT');
   }
 
-  // ---------- CPT suggestion ----------
-  function suggestCPT () {
-    const mod = els.modality.value;
-    if (!mod) return [];
-    const m = state.rules.modalities[mod] || {};
-    const key = [els.region.value, els.bodyPart.value, els.contrast.value].join(' | ');
-    const table = m.cpt_map || {};
-    const hits = table[key] || [];
-    return hits.length ? hits : (m.common_cpt || []);
+  function selectedContexts() {
+    return Array.from(document.querySelectorAll('#context option:checked')).map(o => o.value);
   }
 
-  // ---------- Reason / Review builders ----------
-  function buildReason () {
-    const cond = els.condition.value || els.icd10.value || '(no coded condition)';
-    const ctx  = els.context.value ? `${els.context.value.toLowerCase()}` : 'diagnostic';
+  function syncPreview() {
+    const $ = (s) => document.querySelector(s);
+    $('#pv-modality')  && ($('#pv-modality').textContent  = $('#modality')?.value || '—');
+    $('#pv-region')    && ($('#pv-region').textContent    = $('#region')?.value || '—');
+    const ctx = selectedContexts();
+    $('#pv-context')   && ($('#pv-context').textContent   = ctx.length ? ctx.join(', ') : '—');
+    $('#pv-condition') && ($('#pv-condition').textContent = $('#condition')?.value || '—');
 
-    if (els.indication.value && els.indication.value.trim()) {
-      return els.indication.value.trim();
+    const grp = document.getElementById('contrastGroup');
+    if (grp && !grp.classList.contains('hidden')) {
+      const r = grp.querySelector('input[type=radio]:checked');
+      const oral = document.getElementById('oralContrast')?.checked;
+      let txt = r ? (r.value === 'with_iv' ? 'With IV contrast' : 'Without IV contrast') : '—';
+      if (oral) txt += ' + oral';
+      $('#pv-contrast').textContent = txt;
+    } else {
+      $('#pv-contrast').textContent = '—';
     }
-    const base = `Evaluate ${cond} with ${els.modality.value} ${els.bodyPart.value || els.region.value}`.trim();
-    const bits = [];
-    if (els.contrast.value && els.contrast.value !== 'None') bits.push(els.contrast.value.toLowerCase());
-    if (els.laterality.value && els.laterality.value !== 'N/A') bits.push(els.laterality.value.toLowerCase());
-    if (els.context.value) bits.push(`for ${ctx}`);
-    return [base, bits.join(', ')].filter(Boolean).join(', ').replace(/, for/, ' for');
-  }
 
-  function buildReview () {
-    if (!els.review) return;
-    const lines = [];
-    const cptList = suggestCPT();
-
-    const study = `${val(els.modality)} ${val(els.bodyPart) || val(els.region)} ${val(els.contrast)}`.replace(/\s+/g,' ').trim();
-    if (study) lines.push(`Study: ${study}`);
-    if (els.laterality.value && els.laterality.value !== 'N/A') lines.push(`Laterality: ${els.laterality.value}`);
-    if (els.context.value) lines.push(`Context: ${els.context.value}`);
-    if (els.urgency.value) lines.push(`Urgency: ${els.urgency.value}`);
-    if (els.condition.value) lines.push(`Condition: ${els.condition.value}`);
-    if (els.icd10.value) lines.push(`ICD-10: ${els.icd10.value}`);
-    if (cptList.length) lines.push(`Suggested CPT: ${cptList.join(', ')}`);
-    if (els.pregnant.value && els.pregnant.value!=='Unknown') lines.push(`Pregnancy: ${els.pregnant.value}`);
-    if (els.creatinineDate.value) lines.push(`Most recent creatinine: ${els.creatinineDate.value}`);
-    if (els.allergies.value) lines.push(`Allergies/precautions: ${els.allergies.value}`);
-    if (els.special.value) lines.push(`Special instructions: ${els.special.value}`);
-
-    const reason = buildReason();
-    if (reason) lines.push(`Reason for exam: ${reason}`);
-
-    els.review.textContent = lines.filter(Boolean).join('\n');
+    $('#pv-indication') && ($('#pv-indication').textContent = $('#indication')?.value?.trim() || '—');
   }
 
-  function val (el) {
-    return (el && el.value && el.value !== 'None' && el.value !== 'N/A') ? el.value : '';
+  function buildIndicationText() {
+    const modality  = qs('#modality')?.value || '';
+    const region    = qs('#region')?.value || '';
+    const ctx       = selectedContexts();
+    const condition = qs('#condition')?.value || '';
+    const base = (modality === 'PET/CT') ? 'FDG PET/CT' : modality;
+    const parts = [base, region].filter(Boolean).join(' ');
+    const forTxt = [ctx.join(', '), condition].filter(Boolean).join(' — ');
+    return [parts, forTxt ? `for ${forTxt}` : ''].filter(Boolean).join(' ');
   }
 
-  // ---------- Events ----------
-  function wireEvents () {
-    // Change of modality populates dependent fields and refreshes review
-    els.modality.addEventListener('change', () => {
-      populateForModality(els.modality.value);
-      buildReview();
-    });
+  function suggestStudy() {
+    const modality  = qs('#modality')?.value || '';
+    const region    = qs('#region')?.value || '';
+    const ctx       = selectedContexts();
+    const condition = qs('#condition')?.value || '';
 
-    // Rebuild review on inputs + refresh CPT when key selectors change
-    [
-      els.region, els.bodyPart, els.contrast, els.laterality, els.context,
-      els.condition, els.icd10, els.cpt, els.urgency,
-      els.pregnant, els.creatinineDate, els.allergies, els.special, els.indication
-    ].forEach(el => el && el.addEventListener('input', () => {
-      if ([els.region, els.bodyPart, els.contrast].includes(el)) {
-        const options = suggestCPT();
-        els.cpt.innerHTML = optionize(options, 'Suggested CPT');
-      }
-      buildReview();
-    }));
-
-    // Suggest Reason
-    els.btnSuggest?.addEventListener('click', () => {
-      els.indication.value = buildReason();
-      buildReview();
-      setStatus('Suggested reason inserted.');
-    });
+    const list   = qs('#suggestions');
+    const outHdr = qs('#outHeader');
+    const outReason = qs('#outReason');
 
-    // Copy review
-    els.btnCopy?.addEventListener('click', async () => {
-      try {
-        await navigator.clipboard.writeText(els.review.textContent || '');
-        setStatus('Copied to clipboard.');
-      } catch {
-        setStatus('Unable to copy. Select and copy manually.', 'oh-status warn');
-      }
-    });
+    // Clear list
+    while (list.firstChild) list.removeChild(list.firstChild);
 
-    // Share review
-    els.btnShare?.addEventListener('click', async () => {
-      const text = els.review.textContent || '';
-      const title = 'Radiology Order';
-      try {
-        if (navigator.share) {
-          await navigator.share({ title, text });
-        } else {
-          const url = new URL(window.location);
-          url.hash = encodeURIComponent(text);
-          await navigator.clipboard.writeText(url.toString());
-          alert('Share not supported. A sharable URL has been copied to your clipboard.');
-        }
-        setStatus('Shared.');
-      } catch (e) {
-        console.warn(e);
-        setStatus('Share canceled.', 'oh-status warn');
-      }
-    });
-
-    // Reset
-    els.btnReset?.addEventListener('click', () => {
-      els.form.reset();
-      populateModalities(); // this will auto-select first and repopulate
-      els.review.textContent = 'Select options to build the order…';
-      setStatus('Form reset.');
-    });
-
-    // Submit
-    els.form?.addEventListener('submit', onSubmit);
-  }
-
-  // ---------- Submit (Firestore write or PDF export) ----------
-  async function onSubmit (evt) {
-    evt.preventDefault();
-    const payload = {
-      created_at: new Date().toISOString(),
-      modality: els.modality.value,
-      region: els.region.value,
-      bodyPart: els.bodyPart.value,
-      contrast: els.contrast.value,
-      laterality: els.laterality.value,
-      context: els.context.value,
-      urgency: els.urgency.value,
-      condition: els.condition.value,
-      icd10: els.icd10.value,
-      cpt: els.cpt.value,
-      indication: els.indication.value || buildReason(),
-      pregnant: els.pregnant.value,
-      creatinineDate: els.creatinineDate.value,
-      allergies: els.allergies.value,
-      special: els.special.value,
-      review: els.review.textContent
-    };
+    const picks = [];
+    const includes = (h, arr=[]) => arr.some(n => h.toLowerCase().includes(n.toLowerCase()));
+    const hasCtx = (arr=[]) => arr.some(n => ctx.includes(n));
 
-    // Optional Firestore write
-    if (window.ORADIGIT_FIREBASE_CONFIG && window.firebase) {
-      try {
-        const app = firebase.apps?.length ? firebase.app() : firebase.initializeApp(window.ORADIGIT_FIREBASE_CONFIG);
-        const db = firebase.firestore();
-        await db.collection('orders').add(payload);
-        setStatus('Submitted to Firestore.');
-        els.form.reset();
-        populateModalities();
-        buildReview();
-        return;
-      } catch (e) {
-        console.warn('Firestore submit failed:', e);
-        setStatus('Saved locally (Firestore unavailable).', 'oh-status warn');
-      }
+    if (modality === 'CT') {
+      if (includes(condition, ['renal colic','stone'])) picks.push('CT Abdomen/Pelvis without IV contrast');
+      else if (includes(condition, ['pe','pulmonary embol']) || (/chest/i.test(region) && hasCtx(['Acute']))) picks.push('CT Angio Chest (PE) with IV contrast');
+      else if (/abdomen\/?pelvis/i.test(region)) picks.push('CT Abdomen/Pelvis with IV contrast');
+      else if (/chest/i.test(region)) picks.push('CT Chest with IV contrast');
     }
-
-    // Generate a PDF of the order
-    try {
-      await generatePDF(payload);
-      setStatus('PDF generated.');
-    } catch (e) {
-      console.warn('PDF generation failed:', e);
-      setStatus('PDF generation failed. Use Copy as fallback.', 'oh-status warn');
+    if (modality === 'PET/CT') {
+      if (hasCtx(['Staging','Restaging','Surveillance','Suspected recurrence'])) picks.push('FDG PET/CT skull base to mid-thigh');
     }
-  }
-
-  // ---------- Debug panel (query ?debug=1) ----------
-  function attachDebugPanel() {
-    if (new URLSearchParams(location.search).get('debug') !== '1') return;
-    const host = document.querySelector('.oh-hero .container') || document.body;
-    const el = document.createElement('div');
-    el.style.cssText = 'margin-top:.75rem;font-family:ui-monospace,Menlo,Consolas,monospace;font-size:.85rem;color:#64748b';
-    el.id = 'oh-debug';
-    host.appendChild(el);
-
-    const update = () => {
-      try {
-        const mods = Object.keys(state?.rules?.modalities || {});
-        const mod = document.querySelector('#modality')?.value || '(none)';
-        el.textContent = `[OH DEBUG] v=${APP_VERSION} | source=${state.rulesSource} | modalities=${mods.length} [${mods.join(', ')}] | selected=${mod}`;
-      } catch {
-        el.textContent = `[OH DEBUG] v=${APP_VERSION} | (no rules yet)`;
-      }
-    };
-    update();
-    document.addEventListener('input', update, true);
-    document.addEventListener('change', update, true);
-  }
-
-  // ---------- PDF generation ----------
-  async function generatePDF(payload) {
-    const { jsPDF } = window.jspdf || {};
-    if (!jsPDF) {
-      console.warn('jsPDF not available');
-      alert('PDF generator unavailable. Please try again or use Copy.');
-      return;
+    if (modality === 'MRI') {
+      if (/brain/i.test(region)) picks.push('MRI Brain with and without contrast');
     }
+    if (!picks.length) picks.push(`${modality} ${region}`.trim());
 
-    const doc = new jsPDF({ unit: 'pt', format: 'letter' }); // 612x792pt
-    const marginX = 54; // 0.75"
-    const lineH = 18;
-    let y = 72; // 1" top
-
-    // Header
-    doc.setFont('helvetica', 'bold');
-    doc.setFontSize(16);
-    doc.text('Radiology Order', marginX, y);
-    y += 8;
-
-    doc.setFont('helvetica', 'normal');
-    doc.setFontSize(10);
-    doc.setTextColor(100);
-    doc.text(`Generated: ${new Date().toLocaleString()}`, marginX, y + lineH);
-    y += (lineH * 2);
-
-    // Utility: wrapped text block
-    function write(label, value) {
-      if (!value) return;
-      doc.setFont('helvetica', 'bold');
-      doc.setTextColor(30);
-      doc.setFontSize(11);
-      doc.text(label, marginX, y);
-      y += 14;
-
-      doc.setFont('courier', 'normal'); // mono for aligned look
-      doc.setTextColor(30);
-      doc.setFontSize(11);
-
-      const maxWidth = 612 - marginX * 2;
-      const rows = doc.splitTextToSize(String(value), maxWidth);
-      rows.forEach(row => {
-        doc.text(row, marginX, y);
-        y += lineH;
-        if (y > 760) { // page break safety
-          doc.addPage();
-          y = 72;
-        }
-      });
-      y += 6;
-    }
+    picks.forEach(study => {
+      const li = document.createElement('li');
+      li.innerHTML = `<strong>${study}</strong>`;
+      list.append(li);
+    });
 
-    // Content
-    write('Study', `${payload.modality} ${payload.bodyPart || payload.region} ${payload.contrast}`.replace(/\s+/g,' ').trim());
-    if (payload.laterality && payload.laterality !== 'N/A') write('Laterality', payload.laterality);
-    if (payload.context) write('Context', payload.context);
-    if (payload.urgency) write('Urgency', payload.urgency);
-    if (payload.condition) write('Condition', payload.condition);
-    if (payload.icd10) write('ICD-10', payload.icd10);
-    if (payload.cpt) write('CPT (suggested)', payload.cpt);
-    if (payload.creatinineDate) write('Most recent creatinine', payload.creatinineDate);
-    if (payload.pregnant && payload.pregnant !== 'Unknown') write('Pregnancy', payload.pregnant);
-    if (payload.allergies) write('Allergies / Precautions', payload.allergies);
-    if (payload.special) write('Special instructions', payload.special);
-    write('Reason for exam', payload.indication || payload.review);
-    write('Order summary', payload.review);
-
-    // Footer disclaimer
-    if (y > 720) { doc.addPage(); y = 72; }
-    doc.setFont('helvetica', 'italic');
-    doc.setTextColor(110);
-    doc.setFontSize(9);
-    doc.text('Structured for ordering clarity. Educational use only; not medical advice.', marginX, 780);
-
-    const fnameParts = [
-      'order',
-      (payload.modality || '').replace(/\W+/g,'-').toLowerCase(),
-      Date.now()
-    ].filter(Boolean);
-    const filename = `${fnameParts.join('_')}.pdf`;
-    doc.save(filename);
+    qs('#results')?.removeAttribute('hidden');
+    outHdr.textContent = picks[0] || 'Suggested study';
+    const indication = buildIndicationText();
+    outReason.value = indication;
+    qs('#indication').value = indication;
+    syncPreview();
   }
 })();
-</script>
diff --git a/order-helper/data/rules.json b/order-helper/data/rules.json
index f1c8284..3615bd9 100644
--- a/order-helper/data/rules.json
+++ b/order-helper/data/rules.json
@@ -1,604 +1,332 @@
 {
-  "schema_version": "2.0",
-  "generated_at": "2025-09-15",
-  "modalities": {
-    "X-Ray": {
-      "regions": [
-        "Chest",
-        "Abdomen (KUB)",
-        "Pelvis",
-        "Skull",
-        "Cervical spine",
-        "Thoracic spine",
-        "Lumbar spine",
-        "Scoliosis series",
-        "Upper extremity",
-        "Lower extremity",
-        "Shoulder",
-        "Elbow",
-        "Wrist/Hand",
-        "Hip",
-        "Knee",
-        "Ankle/Foot",
-        "Skeletal survey"
-      ],
-      "body_parts": [
-        "Chest PA/LAT",
-        "Chest AP",
-        "Abdomen KUB",
-        "Pelvis",
-        "Skull",
-        "Cervical spine",
-        "Thoracic spine",
-        "Lumbar spine",
-        "Hand",
-        "Wrist",
-        "Forearm",
-        "Elbow",
-        "Humerus",
-        "Shoulder",
-        "Foot",
-        "Ankle",
-        "Tibia/Fibula",
-        "Knee",
-        "Femur",
-        "Hip"
-      ],
-      "contrast_options": ["None"],
-      "laterality": ["N/A", "Left", "Right", "Bilateral"],
-      "contexts": ["Acute", "Trauma", "Follow-up", "Infection", "Metastatic survey", "Pre-op", "Post-op"],
-      "conditions": [
-        "Fracture",
-        "Dislocation",
-        "Osteoarthritis",
-        "Evaluation for pneumonia",
-        "Pleural effusion",
-        "Foreign body",
-        "Osteomyelitis",
-        "Metastasis",
-        "Scoliosis"
-      ],
-      "icd10": ["S52.509A", "M19.90", "J18.9", "J90", "T18.9XXA", "M86.9", "C79.51", "M41.20"],
-      "common_cpt": ["71046", "74018", "72110", "73562", "73130", "73501", "73610"],
-      "cpt_map": {
-        "Chest | Chest PA/LAT | None": ["71046"],
-        "Abdomen (KUB) | Abdomen KUB | None": ["74018"],
-        "Lumbar spine | Lumbar spine | None": ["72110"],
-        "Knee | Knee | None": ["73562"],
-        "Wrist/Hand | Hand | None": ["73130"],
-        "Ankle/Foot | Ankle | None": ["73610"],
-        "Hip | Hip | None": ["73501"]
-      }
-    },
-
-    "CT": {
-      "regions": [
-        "Head/Brain",
-        "Sinuses",
-        "Maxillofacial/Facial bones",
-        "Temporal bones/IAC",
-        "Neck",
-        "Chest",
-        "Low-dose Lung (Screening)",
-        "Abdomen",
-        "Pelvis",
-        "Abdomen/Pelvis",
-        "CT Urogram",
-        "CT Enterography",
-        "Spine - Cervical",
-        "Spine - Thoracic",
-        "Spine - Lumbar",
-        "Upper extremity",
-        "Lower extremity",
-        "Cardiac Coronary CTA",
-        "Angio - Head/Neck CTA",
-        "Angio - Chest CTA (PE)",
-        "Angio - Aorta CTA",
-        "Angio - Runoff CTA (LE)"
-      ],
-      "body_parts": [
-        "Brain",
-        "Sinuses",
-        "Facial bones",
-        "Temporal bones/IAC",
-        "Neck soft tissues",
-        "Thorax",
-        "Lungs (screening)",
-        "Abdomen",
-        "Pelvis",
-        "Abdomen and pelvis",
-        "Kidneys/ureters/bladder",
-        "Small bowel",
-        "Cervical spine",
-        "Thoracic spine",
-        "Lumbar spine",
-        "Upper extremity",
-        "Lower extremity",
-        "Coronary arteries",
-        "Head/Neck arteries",
-        "Pulmonary arteries",
-        "Aorta",
-        "Lower extremity arteries"
-      ],
-      "contrast_options": ["None", "With contrast", "Without contrast", "With and without"],
-      "laterality": ["N/A", "Left", "Right", "Bilateral"],
-      "contexts": [
-        "Initial evaluation",
-        "Acute",
-        "Follow-up",
-        "Pre-op planning",
-        "Post-op complication",
-        "Oncology staging",
-        "Oncology restaging",
-        "Surveillance",
-        "Trauma",
-        "Infection/inflammation",
-        "Screening"
-      ],
-      "conditions": [
-        "Thunderclap headache",
-        "Head trauma",
-        "Stroke/TIA",
-        "Sinusitis",
-        "Neck mass",
-        "Pulmonary embolism",
-        "Aortic dissection",
-        "Lung nodule",
-        "Pneumonia complication",
-        "RLQ pain/appendicitis",
-        "Renal colic",
-        "Pancreatitis",
-        "Liver lesion",
-        "Diverticulitis",
-        "IBD flare",
-        "Bowel obstruction",
-        "Post-op abdomen",
-        "Hematuria",
-        "Cancer staging (specify)",
-        "Metastatic disease restaging",
-        "Spine trauma",
-        "Radiculopathy",
-        "Spinal stenosis",
-        "Extremity fracture",
-        "Suspected osteomyelitis",
-        "Peripheral arterial disease"
-      ],
-      "icd10": [
-        "I63.9",
-        "S06.9X9A",
-        "J01.90",
-        "R22.1",
-        "I26.99",
-        "I71.00",
-        "R91.1",
-        "J18.9",
-        "R10.31",
-        "N20.0",
-        "K85.90",
-        "K76.9",
-        "K57.30",
-        "K50.90",
-        "K56.60",
-        "Z98.890",
-        "R31.9",
-        "C80.1",
-        "M54.16",
-        "M48.061",
-        "T14.90XA",
-        "M86.9",
-        "I70.209"
-      ],
-      "common_cpt": [
-        "70450",
-        "70486",
-        "70487",
-        "70480",
-        "70481",
-        "70482",
-        "70491",
-        "71250",
-        "71260",
-        "71275",
-        "71271",
-        "74176",
-        "74177",
-        "74178",
-        "72125",
-        "72128",
-        "72131",
-        "73700",
-        "73200",
-        "75574",
-        "70496",
-        "70498",
-        "75635",
-        "73706",
-        "74160",
-        "72193"
-      ],
-      "cpt_map": {
-        "Head/Brain | Brain | Without contrast": ["70450"],
-        "Sinuses | Sinuses | With contrast": ["70487"],
-        "Sinuses | Sinuses | Without contrast": ["70486"],
-        "Maxillofacial/Facial bones | Facial bones | Without contrast": ["70486"],
-        "Temporal bones/IAC | Temporal bones/IAC | Without contrast": ["70480"],
-        "Neck | Neck soft tissues | With contrast": ["70491"],
-        "Chest | Thorax | With contrast": ["71260"],
-        "Chest | Thorax | Without contrast": ["71250"],
-        "Low-dose Lung (Screening) | Lungs (screening) | Without contrast": ["71271"],
-        "Angio - Chest CTA (PE) | Pulmonary arteries | With contrast": ["71275"],
-        "Abdomen | Abdomen | With contrast": ["74160"],
-        "Pelvis | Pelvis | With contrast": ["72193"],
-        "Abdomen/Pelvis | Abdomen and pelvis | With contrast": ["74177"],
-        "Abdomen/Pelvis | Abdomen and pelvis | Without contrast": ["74176"],
-        "CT Urogram | Kidneys/ureters/bladder | With and without": ["74178"],
-        "Spine - Cervical | Cervical spine | Without contrast": ["72125"],
-        "Spine - Thoracic | Thoracic spine | Without contrast": ["72128"],
-        "Spine - Lumbar | Lumbar spine | Without contrast": ["72131"],
-        "Angio - Head/Neck CTA | Head/Neck arteries | With contrast": ["70496", "70498"],
-        "Angio - Aorta CTA | Aorta | With contrast": ["75635"],
-        "Angio - Runoff CTA (LE) | Lower extremity arteries | With contrast": ["73706"]
-      }
-    },
-
-    "MRI": {
-      "regions": [
-        "Brain",
-        "IAC/Temporal bone",
-        "Pituitary",
-        "Orbits",
-        "Cervical spine",
-        "Thoracic spine",
-        "Lumbar spine",
-        "Brachial plexus",
-        "Shoulder",
-        "Elbow",
-        "Wrist/Hand",
-        "Hip",
-        "Knee",
-        "Ankle/Foot",
-        "Liver",
-        "Pancreas",
-        "MRCP",
-        "Kidney",
-        "Pelvis",
-        "Prostate (PI-RADS)",
-        "Rectum",
-        "Female pelvis (uterus/ovaries)",
-        "Cardiac"
-      ],
-      "body_parts": [
-        "Brain",
-        "IACs",
-        "Pituitary",
-        "Orbits",
-        "Cervical spine",
-        "Thoracic spine",
-        "Lumbar spine",
-        "Brachial plexus",
-        "Shoulder",
-        "Elbow",
-        "Wrist",
-        "Hand",
-        "Hip",
-        "Knee",
-        "Ankle",
-        "Foot",
-        "Liver",
-        "Pancreas",
-        "Biliary tree",
-        "Kidneys",
-        "Pelvis",
-        "Prostate",
-        "Rectum",
-        "Uterus/ovaries",
-        "Heart"
-      ],
-      "contrast_options": ["None", "With contrast", "Without contrast", "With and without"],
-      "laterality": ["N/A", "Left", "Right", "Bilateral"],
-      "contexts": ["Acute", "Problem solving", "Follow-up", "Staging", "Restaging", "Surveillance"],
-      "conditions": [
-        "MS",
-        "Seizure",
-        "Tumor",
-        "Subacute stroke",
-        "Dementia workup",
-        "Acoustic neuroma",
-        "Optic neuritis",
-        "Radiculopathy",
-        "Spinal stenosis",
-        "Disc herniation",
-        "Meniscal tear",
-        "Rotator cuff tear",
-        "Labral tear",
-        "AVN hip",
-        "Prostate cancer",
-        "Rectal cancer staging",
-        "Adenomyosis/fibroids",
-        "Endometriosis",
-        "Focal liver lesion",
-        "Pancreatic mass",
-        "Cholestasis/MRCP",
-        "Renal mass",
-        "Cardiomyopathy"
-      ],
-      "icd10": [
-        "G35",
-        "R56.9",
-        "C71.9",
-        "G45.9",
-        "F03.90",
-        "D33.3",
-        "H46.9",
-        "M54.16",
-        "M48.061",
-        "M51.26",
-        "S83.209A",
-        "M75.100",
-        "S73.199A",
-        "M87.052",
-        "C61",
-        "C20",
-        "N80.9",
-        "D25.9",
-        "K76.9",
-        "K86.89",
-        "K83.1",
-        "N28.89",
-        "I42.9"
-      ],
-      "common_cpt": [
-        "70551",
-        "70552",
-        "70553",
-        "70543",
-        "70540",
-        "72141",
-        "72146",
-        "72148",
-        "73221",
-        "73223",
-        "73721",
-        "73723",
-        "72195",
-        "72197",
-        "74181",
-        "74183",
-        "72196",
-        "75561"
-      ],
-      "cpt_map": {
-        "Brain | Brain | Without contrast": ["70551"],
-        "Brain | Brain | With and without": ["70553"],
-        "IAC/Temporal bone | IACs | With and without": ["70553"],
-        "Pituitary | Pituitary | With and without": ["70553"],
-        "Orbits | Orbits | With and without": ["70543"],
-        "Cervical spine | Cervical spine | Without contrast": ["72141"],
-        "Thoracic spine | Thoracic spine | Without contrast": ["72146"],
-        "Lumbar spine | Lumbar spine | Without contrast": ["72148"],
-        "Brachial plexus | Brachial plexus | With and without": ["73223"],
-        "Shoulder | Shoulder | Without contrast": ["73221"],
-        "Knee | Knee | Without contrast": ["73721"],
-        "Liver | Liver | With and without": ["74183"],
-        "Pancreas | Pancreas | With and without": ["74183"],
-        "MRCP | Biliary tree | Without contrast": ["74181"],
-        "Kidney | Kidneys | With and without": ["74183"],
-        "Pelvis | Pelvis | With and without": ["72197"],
-        "Prostate (PI-RADS) | Prostate | With and without": ["72197"],
-        "Cardiac | Heart | With and without": ["75561"]
-      }
-    },
-
-    "PET/CT": {
-      "regions": ["Skull base to mid-thigh", "Whole body"],
-      "body_parts": ["Oncologic PET/CT", "Infection/inflammation PET/CT"],
-      "contrast_options": ["None"],
-      "laterality": ["N/A"],
-      "contexts": [
-        "Staging",
-        "Restaging",
-        "Treatment response",
-        "Surveillance",
-        "Suspected recurrence",
-        "Infection"
-      ],
-      "conditions": [
-        "NSCLC",
-        "Lymphoma",
-        "Colorectal cancer",
-        "Melanoma",
-        "Head & neck cancer",
-        "Sarcoma",
-        "Myeloma",
-        "FUO/endocarditis",
-        "Prosthetic joint infection"
-      ],
-      "icd10": ["C34.90", "C83.30", "C18.9", "C43.9", "C32.9", "C49.9", "C90.00", "R50.9", "I33.0", "T84.59XA"],
-      "common_cpt": ["78815", "78816"],
-      "cpt_map": {
-        "Skull base to mid-thigh | Oncologic PET/CT | None": ["78815"],
-        "Whole body | Oncologic PET/CT | None": ["78816"]
-      }
-    },
-
-    "PET": {
-      "regions": ["Brain", "Cardiac"],
-      "body_parts": ["Brain FDG", "Cardiac FDG viability"],
-      "contrast_options": ["None"],
-      "laterality": ["N/A"],
-      "contexts": ["Dementia", "Epilepsy", "Viability"],
-      "conditions": ["Alzheimer disease", "Frontotemporal dementia", "Seizure localization", "Ischemic cardiomyopathy"],
-      "icd10": ["G30.9", "G31.09", "G40.909", "I25.10"],
-      "common_cpt": ["78608", "78459", "78491", "78492"],
-      "cpt_map": {
-        "Brain | Brain FDG | None": ["78608"],
-        "Cardiac | Cardiac FDG viability | None": ["78459", "78491", "78492"]
-      }
-    },
-
-    "Ultrasound": {
-      "regions": [
-        "Abdomen",
-        "Pelvis",
-        "OB",
-        "Small parts",
-        "Vascular - carotid",
-        "Vascular - venous LE",
-        "Renal",
-        "Aorta (AAA)"
-      ],
-      "body_parts": [
-        "Abdomen complete",
-        "RUQ",
-        "Liver",
-        "Renal",
-        "Pelvis (TA+TV)",
-        "OB 1st trimester",
-        "OB 2nd/3rd trimester",
-        "Thyroid",
-        "Scrotum",
-        "Carotid (bilateral)",
-        "LE venous (bilateral)",
-        "Aorta (AAA)"
-      ],
-      "contrast_options": ["None"],
-      "laterality": ["N/A", "Left", "Right", "Bilateral"],
-      "contexts": ["Acute", "Screening", "Surveillance", "Follow-up"],
-      "conditions": [
-        "RUQ pain/gallstones",
-        "Liver disease/abnormal LFTs",
-        "Hydronephrosis",
-        "Hematuria",
-        "AUB",
-        "Pelvic pain",
-        "Early pregnancy viability",
-        "Thyroid nodule",
-        "Scrotal pain",
-        "DVT",
-        "TIA/bruit",
-        "AAA screening"
-      ],
-      "icd10": [
-        "R10.11",
-        "K80.20",
-        "K76.0",
-        "K74.60",
-        "N13.30",
-        "R31.9",
-        "N93.9",
-        "R10.2",
-        "Z32.01",
-        "E04.1",
-        "N50.89",
-        "I82.4Z3",
-        "I65.23",
-        "Z13.6"
-      ],
-      "common_cpt": ["76700", "76705", "76770", "76856", "76830", "76801", "76805", "76536", "76870", "93880", "93970", "76706"],
-      "cpt_map": {
-        "Abdomen | Abdomen complete | None": ["76700"],
-        "Abdomen | RUQ | None": ["76705"],
-        "Renal | Renal | None": ["76770"],
-        "Pelvis | Pelvis (TA+TV) | None": ["76856", "76830"],
-        "OB | OB 1st trimester | None": ["76801"],
-        "OB | OB 2nd/3rd trimester | None": ["76805"],
-        "Small parts | Thyroid | None": ["76536"],
-        "Small parts | Scrotum | None": ["76870"],
-        "Vascular - carotid | Carotid (bilateral) | None": ["93880"],
-        "Vascular - venous LE | LE venous (bilateral) | None": ["93970"],
-        "Aorta (AAA) | Aorta (AAA) | None": ["76706"]
-      }
-    },
-
-    "Mammography": {
-      "regions": ["Breast"],
-      "body_parts": ["Screening mammogram", "Diagnostic mammogram"],
-      "contrast_options": ["None"],
-      "laterality": ["N/A", "Left", "Right", "Bilateral"],
-      "contexts": ["Screening", "Diagnostic"],
-      "conditions": ["Dense breasts", "Abnormal screening", "Palpable mass", "Breast pain", "Nipple discharge"],
-      "icd10": ["R92.30", "R92.8", "N63.0", "N64.4", "N64.52", "Z12.31"],
-      "common_cpt": ["77067", "77066"],
-      "cpt_map": {
-        "Breast | Screening mammogram | None": ["77067"],
-        "Breast | Diagnostic mammogram | None": ["77066"]
-      }
-    },
-
-    "DEXA": {
-      "regions": ["Axial"],
-      "body_parts": ["Axial skeleton"],
-      "contrast_options": ["None"],
-      "laterality": ["N/A"],
-      "contexts": ["Screening", "Follow-up"],
-      "conditions": ["Osteopenia", "Osteoporosis"],
-      "icd10": ["M85.80", "M81.0", "Z13.820"],
-      "common_cpt": ["77080"],
-      "cpt_map": {
-        "Axial | Axial skeleton | None": ["77080"]
-      }
-    },
-
-    "Nuclear Medicine": {
-      "regions": ["Whole body", "Hepatobiliary", "Renal", "Thyroid", "Bone", "GI bleed"],
-      "body_parts": ["Bone scan (WB)", "HIDA (+/- EF)", "Renogram", "Thyroid scan", "GI bleed scan"],
-      "contrast_options": ["None"],
-      "laterality": ["N/A"],
-      "contexts": ["Staging", "Evaluation", "Follow-up"],
-      "conditions": ["Metastatic disease", "Cholecystitis", "Biliary dyskinesia", "Obstruction", "Hyperthyroidism", "Occult GI bleed"],
-      "icd10": ["C79.9", "K81.0", "K82.8", "N13.9", "E05.90", "K92.2"],
-      "common_cpt": ["78306", "78320", "78226", "78227", "78707", "78014", "78278"],
-      "cpt_map": {
-        "Whole body | Bone scan (WB) | None": ["78306", "78320"],
-        "Hepatobiliary | HIDA (+/- EF) | None": ["78226", "78227"],
-        "Renal | Renogram | None": ["78707"],
-        "Thyroid | Thyroid scan | None": ["78014"],
-        "GI bleed | GI bleed scan | None": ["78278"]
-      }
-    }
-  },
-
-  "icd10_catalog": [
-    "Z01.818",
-    "Z12.31",
-    "R10.9",
-    "R07.9",
-    "R06.02",
-    "R05.9",
-    "R91.1",
-    "R31.9",
-    "C80.1",
-    "C34.90",
-    "C18.9",
-    "C43.9",
-    "C61",
-    "C83.30",
-    "C79.51",
-    "I26.99",
-    "I71.00",
-    "I65.23",
-    "I25.10",
-    "G35",
-    "G40.909",
-    "G30.9",
-    "G31.09",
-    "M54.16",
-    "M48.061",
-    "M86.9",
-    "M19.90",
-    "K56.60",
-    "K57.30",
-    "K85.90",
-    "K80.20",
-    "K74.60",
-    "K76.0",
-    "N13.30",
-    "N28.89",
-    "N93.9",
-    "N80.9",
-    "D25.9",
-    "Z13.6"
-  ]
-}
-
-
+    "schema_version":  "2.0",
+    "generated_at":  "2025-09-19",
+    "modalities":  {
+                       "X-Ray":  {
+                                     "regions":  [
+                                                     "Chest",
+                                                     "Abdomen (KUB)",
+                                                     "Pelvis",
+                                                     "Skull",
+                                                     "Cervical spine",
+                                                     "Thoracic spine",
+                                                     "Lumbar spine",
+                                                     "Scoliosis series",
+                                                     "Upper extremity",
+                                                     "Lower extremity",
+                                                     "Shoulder",
+                                                     "Elbow",
+                                                     "Wrist/Hand",
+                                                     "Hip",
+                                                     "Knee",
+                                                     "Ankle/Foot",
+                                                     "Skeletal survey"
+                                                 ],
+                                     "contexts":  [
+                                                      "Acute",
+                                                      "Trauma",
+                                                      "Follow-up",
+                                                      "Infection",
+                                                      "Metastatic survey",
+                                                      "Pre-op",
+                                                      "Post-op"
+                                                  ],
+                                     "conditions":  [
+                                                        "Fracture",
+                                                        "Dislocation",
+                                                        "Osteoarthritis",
+                                                        "Evaluation for pneumonia",
+                                                        "Pleural effusion",
+                                                        "Foreign body",
+                                                        "Osteomyelitis",
+                                                        "Metastasis",
+                                                        "Scoliosis"
+                                                    ],
+                                     "templates":  {
+                                                       "header":  "X-Ray ",
+                                                       "reason":  "Clinical indication: ; consider . No PHI."
+                                                   }
+                                 },
+                       "CT":  {
+                                  "regions":  [
+                                                  "Head/Brain",
+                                                  "Sinuses",
+                                                  "Maxillofacial/Facial bones",
+                                                  "Temporal bones/IAC",
+                                                  "Neck",
+                                                  "Chest",
+                                                  "Low-dose Lung (Screening)",
+                                                  "Abdomen",
+                                                  "Pelvis",
+                                                  "Abdomen/Pelvis",
+                                                  "CT Urogram",
+                                                  "CT Enterography",
+                                                  "Spine - Cervical",
+                                                  "Spine - Thoracic",
+                                                  "Spine - Lumbar",
+                                                  "Upper extremity",
+                                                  "Lower extremity",
+                                                  "Cardiac Coronary CTA",
+                                                  "Angio - Head/Neck CTA",
+                                                  "Angio - Chest CTA (PE)",
+                                                  "Angio - Aorta CTA",
+                                                  "Angio - Runoff CTA (LE)"
+                                              ],
+                                  "contexts":  [
+                                                   "Initial evaluation",
+                                                   "Acute",
+                                                   "Follow-up",
+                                                   "Pre-op planning",
+                                                   "Post-op complication",
+                                                   "Oncology staging",
+                                                   "Oncology restaging",
+                                                   "Surveillance",
+                                                   "Trauma",
+                                                   "Infection/inflammation",
+                                                   "Screening"
+                                               ],
+                                  "conditions":  [
+                                                     "Thunderclap headache",
+                                                     "Head trauma",
+                                                     "Stroke/TIA",
+                                                     "Sinusitis",
+                                                     "Neck mass",
+                                                     "Pulmonary embolism",
+                                                     "Aortic dissection",
+                                                     "Lung nodule",
+                                                     "Pneumonia complication",
+                                                     "RLQ pain/appendicitis",
+                                                     "Renal colic",
+                                                     "Pancreatitis",
+                                                     "Liver lesion",
+                                                     "Diverticulitis",
+                                                     "IBD flare",
+                                                     "Bowel obstruction",
+                                                     "Post-op abdomen",
+                                                     "Hematuria",
+                                                     "Cancer staging (specify)",
+                                                     "Metastatic disease restaging",
+                                                     "Spine trauma",
+                                                     "Radiculopathy",
+                                                     "Spinal stenosis",
+                                                     "Extremity fracture",
+                                                     "Suspected osteomyelitis",
+                                                     "Peripheral arterial disease"
+                                                 ],
+                                  "templates":  {
+                                                    "header":  "CT ",
+                                                    "reason":  "Clinical indication: ; consider . No PHI."
+                                                }
+                              },
+                       "MRI":  {
+                                   "regions":  [
+                                                   "Brain",
+                                                   "IAC/Temporal bone",
+                                                   "Pituitary",
+                                                   "Orbits",
+                                                   "Cervical spine",
+                                                   "Thoracic spine",
+                                                   "Lumbar spine",
+                                                   "Brachial plexus",
+                                                   "Shoulder",
+                                                   "Elbow",
+                                                   "Wrist/Hand",
+                                                   "Hip",
+                                                   "Knee",
+                                                   "Ankle/Foot",
+                                                   "Liver",
+                                                   "Pancreas",
+                                                   "MRCP",
+                                                   "Kidney",
+                                                   "Pelvis",
+                                                   "Prostate (PI-RADS)",
+                                                   "Rectum",
+                                                   "Female pelvis (uterus/ovaries)",
+                                                   "Cardiac"
+                                               ],
+                                   "contexts":  [
+                                                    "Acute",
+                                                    "Problem solving",
+                                                    "Follow-up",
+                                                    "Staging",
+                                                    "Restaging",
+                                                    "Surveillance"
+                                                ],
+                                   "conditions":  [
+                                                      "MS",
+                                                      "Seizure",
+                                                      "Tumor",
+                                                      "Subacute stroke",
+                                                      "Dementia workup",
+                                                      "Acoustic neuroma",
+                                                      "Optic neuritis",
+                                                      "Radiculopathy",
+                                                      "Spinal stenosis",
+                                                      "Disc herniation",
+                                                      "Meniscal tear",
+                                                      "Rotator cuff tear",
+                                                      "Labral tear",
+                                                      "AVN hip",
+                                                      "Prostate cancer",
+                                                      "Rectal cancer staging",
+                                                      "Adenomyosis/fibroids",
+                                                      "Endometriosis",
+                                                      "Focal liver lesion",
+                                                      "Pancreatic mass",
+                                                      "Cholestasis/MRCP",
+                                                      "Renal mass",
+                                                      "Cardiomyopathy"
+                                                  ],
+                                   "templates":  {
+                                                     "header":  "MRI ",
+                                                     "reason":  "Clinical indication: ; consider . No PHI."
+                                                 }
+                               },
+                       "PET/CT":  {
+                                      "regions":  [
+                                                      "Skull base to mid-thigh",
+                                                      "Whole body"
+                                                  ],
+                                      "contexts":  [
+                                                       "Staging",
+                                                       "Restaging",
+                                                       "Treatment response",
+                                                       "Surveillance",
+                                                       "Suspected recurrence",
+                                                       "Infection"
+                                                   ],
+                                      "conditions":  [
+                                                         "NSCLC",
+                                                         "Lymphoma",
+                                                         "Colorectal cancer",
+                                                         "Melanoma",
+                                                         "Head \u0026 neck cancer",
+                                                         "Sarcoma",
+                                                         "Myeloma",
+                                                         "FUO/endocarditis",
+                                                         "Prosthetic joint infection"
+                                                     ],
+                                      "templates":  {
+                                                        "header":  "PET/CT ",
+                                                        "reason":  "Clinical indication: ; consider . No PHI."
+                                                    }
+                                  },
+                       "PET":  {
+                                   "regions":  [
+                                                   "Brain",
+                                                   "Cardiac"
+                                               ],
+                                   "contexts":  [
+                                                    "Dementia",
+                                                    "Epilepsy",
+                                                    "Viability"
+                                                ],
+                                   "conditions":  [
+                                                      "Alzheimer disease",
+                                                      "Frontotemporal dementia",
+                                                      "Seizure localization",
+                                                      "Ischemic cardiomyopathy"
+                                                  ],
+                                   "templates":  {
+                                                     "header":  "PET ",
+                                                     "reason":  "Clinical indication: ; consider . No PHI."
+                                                 }
+                               },
+                       "Ultrasound":  {
+                                          "regions":  [
+                                                          "Abdomen",
+                                                          "Pelvis",
+                                                          "OB",
+                                                          "Small parts",
+                                                          "Vascular - carotid",
+                                                          "Vascular - venous LE",
+                                                          "Renal",
+                                                          "Aorta (AAA)"
+                                                      ],
+                                          "contexts":  [
+                                                           "Acute",
+                                                           "Screening",
+                                                           "Surveillance",
+                                                           "Follow-up"
+                                                       ],
+                                          "conditions":  [
+                                                             "RUQ pain/gallstones",
+                                                             "Liver disease/abnormal LFTs",
+                                                             "Hydronephrosis",
+                                                             "Hematuria",
+                                                             "AUB",
+                                                             "Pelvic pain",
+                                                             "Early pregnancy viability",
+                                                             "Thyroid nodule",
+                                                             "Scrotal pain",
+                                                             "DVT",
+                                                             "TIA/bruit",
+                                                             "AAA screening"
+                                                         ],
+                                          "templates":  {
+                                                            "header":  "Ultrasound ",
+                                                            "reason":  "Clinical indication: ; consider . No PHI."
+                                                        }
+                                      },
+                       "Mammography":  {
+                                           "regions":  "Breast",
+                                           "contexts":  [
+                                                            "Screening",
+                                                            "Diagnostic"
+                                                        ],
+                                           "conditions":  [
+                                                              "Dense breasts",
+                                                              "Abnormal screening",
+                                                              "Palpable mass",
+                                                              "Breast pain",
+                                                              "Nipple discharge"
+                                                          ],
+                                           "templates":  {
+                                                             "header":  "Mammography ",
+                                                             "reason":  "Clinical indication: ; consider . No PHI."
+                                                         }
+                                       },
+                       "DEXA":  {
+                                    "regions":  "Axial",
+                                    "contexts":  [
+                                                     "Screening",
+                                                     "Follow-up"
+                                                 ],
+                                    "conditions":  [
+                                                       "Osteopenia",
+                                                       "Osteoporosis"
+                                                   ],
+                                    "templates":  {
+                                                      "header":  "DEXA ",
+                                                      "reason":  "Clinical indication: ; consider . No PHI."
+                                                  }
+                                },
+                       "Nuclear Medicine":  {
+                                                "regions":  [
+                                                                "Whole body",
+                                                                "Hepatobiliary",
+                                                                "Renal",
+                                                                "Thyroid",
+                                                                "Bone",
+                                                                "GI bleed"
+                                                            ],
+                                                "contexts":  [
+                                                                 "Staging",
+                                                                 "Evaluation",
+                                                                 "Follow-up"
+                                                             ],
+                                                "conditions":  [
+                                                                   "Metastatic disease",
+                                                                   "Cholecystitis",
+                                                                   "Biliary dyskinesia",
+                                                                   "Obstruction",
+                                                                   "Hyperthyroidism",
+                                                                   "Occult GI bleed"
+                                                               ],
+                                                "templates":  {
+                                                                  "header":  "Nuclear Medicine ",
+                                                                  "reason":  "Clinical indication: ; consider . No PHI."
+                                                              }
+                                            }
+                   }
+}
\ No newline at end of file
diff --git a/order-helper/index.html b/order-helper/index.html
index b0edc98..20d97a4 100644
--- a/order-helper/index.html
+++ b/order-helper/index.html
@@ -2,23 +2,26 @@
 layout: default
 title: OraDigit Order Helper
 permalink: /order-helper/
-description: Evidence-based PET/CT, CT, MRI, US, X-Ray — structured order helper with validation and PDF export. No PHI. Educational use only.
+description: Evidence-based PET/CT, CT, and MRI order helper with validation and export. No PHI. Educational use only.
 ---
 
 <!-- Page-scoped assets & config -->
-<link rel="stylesheet" href="{{ '/order-helper/style.css' | relative_url }}?v=20250913" />
-<meta name="oh-rules-path" content="{{ '/order-helper/data/rules.json' | relative_url }}?v=20250913" />
-<meta name="oh-version" content="20250913" />
+<link rel="stylesheet" href="{{ '/order-helper/style.css' | relative_url }}?v=20250904">
+<meta name="oh-rules-path" content="{{ '/order-helper/data/rules.json' | relative_url }}?v=20250904">
+<meta name="oh-version" content="20250904">
 
 <!-- Error beacon: surface JS errors in the status bar -->
 <script>
   window.addEventListener('error', e => {
     const s = document.getElementById('status');
-    if (s) { s.textContent = 'JavaScript error: ' + (e.message || 'Unknown'); s.className = 'oh-status error'; }
-  });
-  window.addEventListener('unhandledrejection', e => {
-    const s = document.getElementById('status');
-    if (s) { s.textContent = 'App error: ' + (e.reason?.message || e.reason || 'Unknown'); s.className = 'oh-status error'; }
+<<<<<<< HEAD
+    if (s) {
+      s.textContent = 'JavaScript error: ' + (e.message || 'Unknown');
+      s.className = 'status error';
+    }
+=======
+    if (s) { s.textContent = 'JavaScript error: ' + (e.message || 'Unknown'); s.className = 'status error'; }
+>>>>>>> 47d41e0 (OH: switch to data/ (case fix); update index + app (live preview & loader))
   });
 </script>
 
@@ -29,200 +32,259 @@
     if (!s) return;
     try {
       const url = document.querySelector('meta[name="oh-rules-path"]')?.content;
-      if (!url) { s.textContent = 'Missing oh-rules-path meta.'; s.className = 'oh-status error'; return; }
+      if (!url) { s.textContent = 'Missing oh-rules-path meta.'; s.className = 'status error'; return; }
       s.textContent = 'Boot check… fetching rules…';
       const r = await fetch(url, { cache: 'no-store' });
-      if (r.ok) { s.textContent = 'Boot check OK. Loading app…'; s.className = 'oh-status success'; }
-      else { s.textContent = `Rules fetch failed (${r.status}). Check path/case: ` + url; s.className = 'oh-status error'; }
+      if (r.ok) { s.textContent = 'Boot check OK. Loading app…'; s.className = 'status success'; }
+      else { s.textContent = `Rules fetch failed (${r.status}). Check path/case: ` + url; s.className = 'status error'; }
     } catch (e) {
       s.textContent = 'Rules fetch error: ' + e.message;
-      s.className = 'oh-status error';
+      s.className = 'status error';
     }
   });
 </script>
 
-<section class="oh-hero">
-  <div class="container">
+<section class="order-helper container" aria-labelledby="oh-title">
+  <header class="oh-header">
     <h1 id="oh-title">OraDigit Order Helper</h1>
-    <p class="sub">
-      Structure payer-ready imaging orders. Select modality and context; we’ll generate a professional
-      clinical indication, show prep/flags, and export a PDF. All client-side. No PHI.
+    <p class="lead">
+      Structure clear, payer-ready imaging orders. Select modality and context; we’ll generate
+      a professional clinical indication and surface prep/flags. All client-side. No PHI.
     </p>
-    <div id="status" class="oh-status" role="status" aria-live="polite">Initializing…</div>
-    <div id="dbg" class="oh-dbg" aria-hidden="true"></div>
-  </div>
-</section>
+    <div id="status" class="status" role="status" aria-live="polite"></div>
+    <div id="rulesErrors" class="status error" style="display:none"></div>
+  </header>
 
-<section class="oh-app container" aria-labelledby="oh-title" aria-label="Order Helper form">
   <div class="oh-grid">
     <!-- ================= LEFT: FORM ================= -->
-    <form id="orderForm" class="oh-card" autocomplete="off" novalidate>
+    <form id="orderForm" class="oh-form" novalidate>
       <!-- Modality -->
-      <div class="oh-row">
+      <div class="field">
         <label for="modality">Modality <span aria-hidden="true">*</span></label>
         <select id="modality" name="modality" required>
-          <option value="" disabled selected>Select modality…</option>
-          <!-- options populated by app.js from rules.json -->
+          <option value="">Select…</option>
+          <option value="PET/CT" selected>PET/CT</option>
+          <option value="CT">CT</option>
+          <option value="MRI">MRI</option>
         </select>
-        <small class="hint">Regions, body parts, contrast, and contexts adapt to your selection.</small>
-      </div>
-
-      <!-- Region + Body Part -->
-      <div class="oh-row two">
-        <div>
-          <label for="region">Region <span aria-hidden="true">*</span></label>
-          <select id="region" name="region" required>
-            <option value="" disabled selected>Select region…</option>
-          </select>
-        </div>
-        <div>
-          <label for="bodyPart">Body Part <span aria-hidden="true">*</span></label>
-          <select id="bodyPart" name="bodyPart" required>
-            <option value="" disabled selected>Select body part…</option>
-          </select>
-        </div>
+        <small class="hint">Regions, contexts, and conditions adapt to your selection.</small>
       </div>
 
-      <!-- Contrast + Laterality -->
-      <div class="oh-row two">
-        <div>
-          <label for="contrast">Contrast</label>
-          <select id="contrast" name="contrast">
-            <option value="" disabled selected>Select contrast…</option>
-          </select>
-        </div>
-        <div>
-          <label for="laterality">Laterality</label>
-          <select id="laterality" name="laterality">
-            <option value="" disabled selected>Select laterality…</option>
-          </select>
-        </div>
+      <!-- Region -->
+      <div class="field">
+        <label for="region">Region <span aria-hidden="true">*</span></label>
+        <select id="region" name="region" required></select>
       </div>
 
-      <!-- Context + Urgency -->
-      <div class="oh-row two">
-        <div>
-          <label for="context">Clinical Context</label>
-          <select id="context" name="context">
-            <option value="" disabled selected>Select context…</option>
-          </select>
-          <small class="hint">e.g., Staging, Restaging, Treatment response, Surveillance, Acute</small>
-        </div>
-        <div>
-          <label for="urgency">Urgency</label>
-          <select id="urgency" name="urgency">
-            <option value="Routine" selected>Routine</option>
-            <option value="Urgent">Urgent</option>
-            <option value="STAT">STAT</option>
-          </select>
-        </div>
-      </div>
+      <!-- Context (chips UI expected by app.js) -->
+      <div class="field">
+        <label>Context <span aria-hidden="true">*</span></label>
 
-      <!-- Condition + ICD-10 -->
-      <div class="oh-row two">
-        <div>
-          <label for="condition">Condition (structured)</label>
-          <input id="condition" name="condition" list="conditionList" placeholder="e.g., NSCLC, stroke, appendicitis" />
-          <datalist id="conditionList"></datalist>
-        </div>
-        <div>
-          <label for="icd10">ICD-10</label>
-          <input id="icd10" name="icd10" list="icdList" placeholder="e.g., C34.90" />
-          <datalist id="icdList"></datalist>
-        </div>
-      </div>
+        <!-- Chips rendered dynamically by app.js -->
+        <div id="contextChips" class="oh-chips" role="group" aria-label="Context"></div>
 
-      <!-- CPT (suggested) -->
-      <div class="oh-row">
-        <label for="cpt">CPT (suggested)</label>
-        <select id="cpt" name="cpt">
-          <option value="" disabled selected>Suggested CPT…</option>
-        </select>
-      </div>
+        <!-- Hidden mirror for compatibility (app.js keeps in sync) -->
+        <select id="context" name="context" multiple hidden></select>
 
-      <!-- Indication -->
-      <div class="oh-row">
-        <label for="indication">Clinical Indication (free text)</label>
-        <textarea id="indication" name="indication" rows="3" placeholder="Auto-generated (you can edit)…"></textarea>
+        <small class="hint">Click one or more (e.g., staging, restaging, surveillance, acute, follow-up).</small>
       </div>
 
-      <!-- Safety / Special -->
-      <div class="oh-row two">
-        <div>
-          <label for="pregnant">Pregnancy status</label>
-          <select id="pregnant" name="pregnant">
-            <option value="Unknown" selected>Unknown</option>
-            <option value="No">No</option>
-            <option value="Yes">Yes</option>
-            <option value="Not applicable">Not applicable</option>
-          </select>
-        </div>
-        <div>
-          <label for="creatinineDate">Most recent creatinine (date)</label>
-          <input id="creatinineDate" name="creatinineDate" type="date" placeholder="mm/dd/yyyy" />
-        </div>
+      <!-- Condition (with datalist suggestions) -->
+      <div class="field">
+        <label for="condition">Condition</label>
+        <input id="condition" name="condition" list="conditionList" placeholder="e.g., NSCLC, renal colic, PE, appendicitis"/>
+        <datalist id="conditionList"></datalist>
+        <small class="hint">Start typing to see common conditions for the chosen modality.</small>
       </div>
 
-      <div class="oh-row">
-        <label for="allergies">Allergies / Precautions</label>
-        <textarea id="allergies" name="allergies" rows="2" placeholder="e.g., contrast allergy; premed needed"></textarea>
-      </div>
+      <!-- Contrast (CT only; shown/hidden by JS) -->
+      <fieldset id="contrastGroup" class="oh-contrast hidden">
+        <legend>CT Contrast</legend>
+        <label class="inline"><input type="radio" name="contrast" value="with_iv"> With IV contrast</label>
+        <label class="inline"><input type="radio" name="contrast" value="without_iv"> Without IV contrast</label>
+        <label class="inline"><input type="checkbox" id="oralContrast" value="oral"> Add oral contrast (abd/pelvis)</label>
+        <small class="hint">We’ll auto-suggest based on condition (e.g., “renal colic” → without IV; “PE/CTA” → with IV).</small>
+      </fieldset>
 
-      <div class="oh-row">
-        <label for="special">Special Instructions</label>
-        <input id="special" name="special" placeholder="e.g., sedation, interpreter, infection precautions" />
+      <!-- Indication (auto-built but editable) -->
+      <div class="field">
+        <label for="indication">Clinical Indication</label>
+        <textarea id="indication" name="indication" rows="3" placeholder="Auto-generated (you can edit)…"></textarea>
       </div>
 
-      <!-- Actions -->
-      <div class="oh-actions">
-        <button type="button" id="btnSuggest" class="btn">Suggest Reason</button>
-        <button type="button" id="btnCopy" class="btn btn-secondary">Copy</button>
-        <button type="button" id="btnShare" class="btn btn-outline">Share</button>
-        <button type="button" id="btnReset" class="btn btn-warning">Reset</button>
-        <button type="submit" id="btnSubmit" class="btn btn-primary">Submit & Export PDF</button>
+      <div class="actions">
+        <button type="submit" class="btn-primary">Suggest Order</button>
+        <button type="button" id="copyIndication" class="btn-ghost" aria-label="Copy clinical indication">Copy Indication</button>
+        <span id="errMsg" role="alert" class="muted"></span>
+        <div id="dbg" aria-live="polite" class="muted" style="font-size:12px"></div>
       </div>
     </form>
 
-    <!-- ================= RIGHT: ORDER REVIEW ================= -->
-    <aside class="oh-card review" aria-label="Order review">
-      <div class="oh-review-header">
-        <h2>Order Review</h2>
-        <div class="oh-review-actions">
-          <button id="btnCopy" class="icon-btn" title="Copy to clipboard">📋</button>
-          <button id="btnShare" class="icon-btn" title="Share">🔗</button>
+    <!-- ================= RIGHT: PREVIEW / SUGGESTIONS ================= -->
+    <aside class="oh-aside" aria-label="Order preview and suggestions">
+      <div class="card">
+        <h2>Order Preview</h2>
+        <div class="preview">
+          <div><strong>Modality:</strong> <span id="pv-modality">—</span></div>
+          <div><strong>Region:</strong> <span id="pv-region">—</span></div>
+          <div><strong>Context:</strong> <span id="pv-context">—</span></div>
+          <div><strong>Condition:</strong> <span id="pv-condition">—</span></div>
+          <div><strong>Contrast:</strong> <span id="pv-contrast">—</span></div>
+          <hr>
+          <div><strong>Clinical Indication</strong></div>
+          <pre id="pv-indication" class="indication-box">—</pre>
         </div>
       </div>
-      <pre id="review" class="oh-review">Select options to build the order…</pre>
+
+      <div class="card">
+        <h2>Suggested Studies</h2>
+        <ul id="suggestions" class="suggest-list" aria-live="polite">
+          <li class="muted">Suggestions will appear when available.</li>
+        </ul>
+      </div>
     </aside>
   </div>
 
-  <p class="oh-disclaimer">Do not enter PHI beyond what is clinically required. This tool supports ordering but does not replace clinical judgment.</p>
+  <!-- ================= RESULTS (filled by app.js) ================= -->
+  <section id="results" hidden style="margin-top:16px">
+    <h2 id="outHeader"></h2>
+
+    <label class="oh-label" for="outReason">Reason for exam</label>
+    <textarea id="outReason" class="oh-input" rows="3"></textarea>
+
+    <div class="oh-grid" style="margin-top:12px">
+      <div>
+        <h3>Prep / Contraindications</h3>
+        <ul id="outPrep"></ul>
+      </div>
+      <div>
+        <h3>Supporting Docs</h3>
+        <ul id="outDocs"></ul>
+      </div>
+      <div>
+        <h3>Clinical Flags</h3>
+        <ul id="outFlags"></ul>
+      </div>
+      <div>
+        <h3>ICD-10 Suggestions</h3>
+        <ul id="outICD"></ul>
+      </div>
+    </div>
+
+    <div class="actions">
+      <button id="copyReasonBtn" type="button" class="btn btn-light">Copy Reason</button>
+      <button id="copyAllBtn" type="button" class="btn btn-secondary">Copy All</button>
+      <button id="printBtn" type="button" class="btn btn-tertiary">Print</button>
+    </div>
+  </section>
+
+  <!-- Hidden by default; enable via /order-helper/?debug=1 -->
+  <details id="rulesInfo" style="margin-top:1rem" hidden>
+    <summary>What rules are applied?</summary>
+    <p>
+      Rules load from <code>/order-helper/data/rules.json</code>. You can update that file anytime
+      (no code changes). The selector scores by keywords, context, and region; if weak, it falls
+      back to generic oncology tags.
+    </p>
+  </details>
+  <script>
+    if (new URLSearchParams(location.search).get('debug') === '1') {
+      const d = document.getElementById('rulesInfo'); if (d) d.hidden = false;
+    }
+  </script>
+
+  <noscript>
+    <p class="status error">JavaScript is required for the Order Helper to function.</p>
+  </noscript>
 </section>
 
-<!-- Optional Firebase (Compat) — only used if you provide window.ORADIGIT_FIREBASE_CONFIG -->
+<!-- Firebase (Compat CDN) - optional -->
 <script src="https://www.gstatic.com/firebasejs/9.23.0/firebase-app-compat.js" defer></script>
 <script src="https://www.gstatic.com/firebasejs/9.23.0/firebase-auth-compat.js" defer></script>
 <script src="https://www.gstatic.com/firebasejs/9.23.0/firebase-firestore-compat.js" defer></script>
+
+<!-- Lightweight auto-init (only runs if you define window.ORADIGIT_FIREBASE_CONFIG site-wide) -->
 <script>
   document.addEventListener('DOMContentLoaded', () => {
     try {
       if (window.ORADIGIT_FIREBASE_CONFIG && !window.firebase?.apps?.length) {
         firebase.initializeApp(window.ORADIGIT_FIREBASE_CONFIG);
-        window.OH_FIREBASE = { app: firebase.app(), auth: firebase.auth(), db: firebase.firestore() };
+        window.OH_FIREBASE = {
+          app: firebase.app(),
+          auth: firebase.auth(),
+          db: firebase.firestore()
+        };
         const s = document.getElementById('status');
-        if (s) { s.textContent = 'Firebase ready.'; s.className = 'oh-status success'; }
+        if (s) { s.textContent = 'Firebase ready.'; s.className = 'status success'; }
       }
     } catch (e) {
       const s = document.getElementById('status');
-      if (s) { s.textContent = 'Firebase failed to initialize. Check your config.'; s.className = 'oh-status warn'; }
+      if (s) { s.textContent = 'Firebase failed to initialize. Check your config.'; s.className = 'status warn'; }
       console.warn('Firebase init error:', e);
     }
   });
 </script>
 
-<!-- PDF generator (client-side) -->
-<script src="https://cdn.jsdelivr.net/npm/jspdf@2.5.1/dist/jspdf.umd.min.js" defer></script>
+<<<<<<< HEAD
+<!-- Tiny UX helpers (keeps the preview in sync; app.js handles business logic) -->
+<script>
+  document.addEventListener('DOMContentLoaded', () => {
+    const $ = (s) => document.querySelector(s);
+    const form = $('#orderForm');
+
+    // Keep preview in sync with the form & chips
+    const syncPreview = () => {
+      const $s = (sel) => document.querySelector(sel);
+      $s('#pv-modality').textContent  = $s('#modality')?.value || '—';
+      $s('#pv-region').textContent    = $s('#region')?.value || '—';
+
+      // Read from the hidden <select multiple> that mirrors the chips
+      const ctxOpt = Array.from(document.querySelectorAll('#context option:checked')).map(o => o.value);
+      $s('#pv-context').textContent   = ctxOpt.length ? ctxOpt.join(', ') : '—';
+
+      $s('#pv-condition').textContent = $s('#condition')?.value || '—';
+
+      const grp = document.getElementById('contrastGroup');
+      if (grp && !grp.classList.contains('hidden')) {
+        const r = grp.querySelector('input[type=radio]:checked');
+        const oral = document.getElementById('oralContrast')?.checked;
+        let txt = r ? (r.value === 'with_iv' ? 'With IV contrast' : 'Without IV contrast') : '—';
+        if (oral) txt += ' + oral';
+        $s('#pv-contrast').textContent = txt;
+      } else {
+        $s('#pv-contrast').textContent = '—';
+      }
+
+      $s('#pv-indication').textContent = $s('#indication')?.value?.trim() || '—';
+    };
+
+    ['change','input','click'].forEach(evt => {
+      form.addEventListener(evt, syncPreview, true);
+    });
+
+    // Copy indication button
+    $('#copyIndication')?.addEventListener('click', async () => {
+      const text = $('#indication')?.value || '';
+      if (!text.trim()) return;
+      try {
+        await navigator.clipboard.writeText(text.trim());
+        const s = document.getElementById('status');
+        if (s) { s.textContent = 'Clinical indication copied to clipboard.'; s.className='status success'; }
+      } catch {
+        const s = document.getElementById('status');
+        if (s) { s.textContent = 'Unable to copy. Please select and copy manually.'; s.className='status warn'; }
+      }
+    });
+
+    // Initial render
+    syncPreview();
+  });
+</script>
+
+<!-- App logic (must be last so helpers & probes are ready) -->
+<script defer src="{{ '/order-helper/app.js' | relative_url }}?v=20250905"></script>
 
-<!-- App logic (keep last so DOM exists) -->
-<script defer src="{{ '/order-helper/firebase-config.js' | relative_url }}?v=20250913"></script>
-<script defer src="{{ '/order-helper/app.js' | relative_url }}?v=20250913"></script>
+=======
+<!-- App logic (keep last) -->
+<script defer src="{{ '/order-helper/app.js' | relative_url }}?v=20250904"></script>
+>>>>>>> 47d41e0 (OH: switch to data/ (case fix); update index + app (live preview & loader))
