diff --git a/content_gen/adapters/kit_extraction_adapter.py b/content_gen/adapters/kit_extraction_adapter.py
index b73f9a6..fe2389c 100644
--- a/content_gen/adapters/kit_extraction_adapter.py
+++ b/content_gen/adapters/kit_extraction_adapter.py
@@ -1,6 +1,6 @@
 from pathlib import Path
 import os
-from typing import List, Optional, Callable
+from typing import Dict, List, Optional, Callable
 from content_gen.adapters.base_extraction import BaseExtractionAdapter
 from content_gen.core.schemas import ProcessedQuestion
 from content_gen.scripts.extraction.pdf_extract_kit_wrapper import PDFExtractKitWrapper
@@ -65,10 +65,18 @@ def extract_content(
             subj = (q_data.get("subject") or "").strip()
             if not subj:
                 subj = self.default_subject
+            raw_opts = q_data.get("options") or {}
+            if not isinstance(raw_opts, dict):
+                raw_opts = {}
+            opts = {str(k): ("" if v is None else str(v)) for k, v in raw_opts.items()}
+            for k in ("A", "B", "C", "D"):
+                opts.setdefault(k, "")
+            q_text = q_data.get("question_text")
+            question_text = "" if q_text is None else str(q_text)
             questions.append(ProcessedQuestion(
                 question_number=q_data.get("question_number", 0),
-                question_text=q_data.get("question_text", ""),
-                options=q_data.get("options", {}),
+                question_text=question_text,
+                options=opts,
                 subject=subj,
                 metadata={
                     "stem_images": stem_image_paths,
diff --git a/content_gen/scripts/extraction/kit/page_processor.py b/content_gen/scripts/extraction/kit/page_processor.py
index 949e241..d3eaf1a 100644
--- a/content_gen/scripts/extraction/kit/page_processor.py
+++ b/content_gen/scripts/extraction/kit/page_processor.py
@@ -19,7 +19,7 @@ class KitPageProcessorMixin:
 
     # --- cross-mixin method dependencies (provided by sibling mixins) ---
     @abstractmethod
-    def _clean_noise(self, text: str) -> str: ...
+    def _clean_noise(self, text: str | None) -> str: ...
 
     @abstractmethod
     def _reconstruct_line_text(
@@ -70,8 +70,12 @@ def _process_page(
             if "lines" in block:
                 for line in block["lines"]:
                     for span in line["spans"]:
-                        if not span["text"].strip():
+                        raw_t = span.get("text")
+                        text = "" if raw_t is None else str(raw_t)
+                        if not text.strip():
                             continue
+                        if span.get("text") != text:
+                            span = {**span, "text": text}
                         all_spans.append(span)
 
         spans_by_question = {q: [] for q in questions}
@@ -117,7 +121,7 @@ def _process_page(
 
                 marker_indices = []
                 for i, span in enumerate(vline):
-                    txt = span["text"].strip().rstrip(".")
+                    txt = (span.get("text") or "").strip().rstrip(".")
                     font = span["font"].lower()
                     x = span["bbox"][0]
                     known_cols = [70, 81, 170, 181, 270, 281, 370, 381]
@@ -134,7 +138,7 @@ def _process_page(
                             line_avg_baseline,
                             line_main_size,
                         )
-                        prefix_text = self._clean_noise(prefix_text)
+                        prefix_text = (self._clean_noise(prefix_text) or "").strip()
                         if prefix_text:
                             if current_field == "question_text":
                                 questions[q_num]["question_text"] += " " + prefix_text
@@ -153,15 +157,25 @@ def _process_page(
                             line_avg_baseline,
                             line_main_size,
                         )
-                        opt_text = self._clean_noise(opt_text)
+                        opt_text = (self._clean_noise(opt_text) or "").strip()
                         questions[q_num]["options"][opt_letter] += " " + opt_text
                         current_field = opt_letter
                 else:
                     line_text = self._reconstruct_line_text(
                         vline, line_avg_baseline, line_main_size
                     )
-                    line_text = self._clean_noise(line_text)
+                    line_text = (self._clean_noise(line_text) or "").strip()
                     if line_text:
+                        m_opt = re.match(
+                            r"(?i)^\s*([A-D])[\.\):]\s*(.*)$", line_text
+                        )
+                        if m_opt:
+                            letter = m_opt.group(1).upper()
+                            rest = (m_opt.group(2) or "").strip()
+                            if letter in questions[q_num]["options"]:
+                                questions[q_num]["options"][letter] += " " + rest
+                                current_field = letter
+                                continue
                         if current_field == "question_text":
                             if not questions[q_num]["question_text"]:
                                 line_text = re.sub(r"^\d+[\.\s]*", "", line_text)
@@ -197,10 +211,10 @@ def _process_page(
         temp_img_path.unlink()
 
         for q in questions.values():
-            q["question_text"] = q["question_text"].strip()
+            q["question_text"] = (q.get("question_text") or "").strip()
             q["question_text"] = re.sub(r"^(\d+[\.\s]*)+", "", q["question_text"])
             for opt in q["options"]:
-                val = q["options"][opt].strip()
+                val = (q["options"].get(opt) or "").strip()
                 val = re.sub(r"\s+[\d_]$", "", val)
                 q["options"][opt] = val
 
@@ -230,9 +244,9 @@ def _detect_question_numbers_with_positions(self, page: fitz.Page) -> List[tuple
             if "lines" in block:
                 for i, line in enumerate(block["lines"]):
                     line_text = " ".join(
-                        span["text"].strip()
+                        (span.get("text") or "").strip()
                         for span in line["spans"]
-                        if span["text"].strip()
+                        if (span.get("text") or "").strip()
                     )
                     line_text = line_text.strip()
 
@@ -268,13 +282,13 @@ def _detect_question_numbers_with_positions(self, page: fitz.Page) -> List[tuple
                             check_text = ""
                             if i + 1 < len(block["lines"]):
                                 check_text = " ".join(
-                                    s["text"] for s in block["lines"][i + 1]["spans"]
+                                    (s.get("text") or "") for s in block["lines"][i + 1]["spans"]
                                 ).strip()
                             elif block_idx + 1 < len(blocks):
                                 next_block = blocks[block_idx + 1]
                                 if "lines" in next_block and len(next_block["lines"]) > 0:
                                     check_text = " ".join(
-                                        s["text"] for s in next_block["lines"][0]["spans"]
+                                        (s.get("text") or "") for s in next_block["lines"][0]["spans"]
                                     ).strip()
 
                             if len(check_text) > 3:
diff --git a/content_gen/scripts/extraction/kit/question_builder.py b/content_gen/scripts/extraction/kit/question_builder.py
index d60fed3..8dc26ae 100644
--- a/content_gen/scripts/extraction/kit/question_builder.py
+++ b/content_gen/scripts/extraction/kit/question_builder.py
@@ -30,6 +30,7 @@ def _merge_questions(self, questions: List[Dict]) -> List[Dict]:
                     },
                     "stem_images": list(dict.fromkeys(q.get("stem_images", []) or [])),
                     "option_images": q.get("option_images", {}) or {},
+                    "extraction_warnings": list(q.get("extraction_warnings") or []),
                 }
                 continue
 
@@ -46,6 +47,13 @@ def _merge_questions(self, questions: List[Dict]) -> List[Dict]:
                 existing = merged[num]["options"].get(opt, "")
                 merged[num]["options"][opt] = f"{existing} {opt_text}".strip()
 
+            new_warn = q.get("extraction_warnings") or []
+            if new_warn:
+                prev = merged[num].get("extraction_warnings") or []
+                merged[num]["extraction_warnings"] = list(
+                    dict.fromkeys([*prev, *new_warn])
+                )
+
             merged[num]["stem_images"] = list(
                 dict.fromkeys(
                     merged[num]["stem_images"] + (q.get("stem_images", []) or [])
diff --git a/content_gen/scripts/extraction/kit/text_utils.py b/content_gen/scripts/extraction/kit/text_utils.py
index 3425559..5ffec33 100644
--- a/content_gen/scripts/extraction/kit/text_utils.py
+++ b/content_gen/scripts/extraction/kit/text_utils.py
@@ -11,8 +11,10 @@ class KitTextUtilsMixin:
     extraction_noise_patterns: List[str]
     outputs_dir: Optional[Path]
     base_name: Optional[str]
-    def _clean_noise(self, text: str) -> str:
-        """Filter global noise and map symbols from reconstructed text parts"""
+    def _clean_noise(self, text: str | None) -> str:
+        """Filter global noise and map symbols from reconstructed text parts."""
+        if text is None:
+            text = ""
         symbol_map = {
             "\uf070": "π",
             "\uf061": "α",
@@ -47,25 +49,37 @@ def _clean_noise(self, text: str) -> str:
     def _reconstruct_line_text(
         self, spans: List[Dict], avg_baseline: float, main_size: float
     ) -> str:
-        """Helper to reconstruct text with markup from a list of spans on one line"""
+        """Reconstruct one visual line from spans; insert spaces from PDF x-gaps between words."""
         if not spans:
             return ""
-        parts = []
+        pieces: List[tuple[str, float, float]] = []
         for span in spans:
-            text = span["text"]
+            raw = span.get("text")
+            text = "" if raw is None else str(raw)
             size = span["size"]
             top = span["bbox"][1]
+            x0, x1 = float(span["bbox"][0]), float(span["bbox"][2])
 
             if size < main_size * 0.9:
                 if top < avg_baseline - 1:
-                    parts.append(f"^{text}")
+                    piece = f"^{text}"
                 elif top > avg_baseline + 1:
-                    parts.append(f"_{text}")
+                    piece = f"_{text}"
                 else:
-                    parts.append(text)
+                    piece = text
             else:
-                parts.append(text)
-        return "".join(parts).strip()
+                piece = text
+            pieces.append((piece, x0, x1))
+
+        out: List[str] = []
+        gap_space_px = 1.25
+        for i, (piece, x0, _x1) in enumerate(pieces):
+            if i > 0:
+                prev_x1 = pieces[i - 1][2]
+                if x0 - prev_x1 > gap_space_px:
+                    out.append(" ")
+            out.append(piece)
+        return "".join(out).strip()
 
     def _generate_processed_text(self, output_data: Dict) -> None:
         """Generate the standard processed text file in data/outputs following prompts.py"""
@@ -87,10 +101,14 @@ def _generate_processed_text(self, output_data: Dict) -> None:
                     f"Question {q['question_number']}Question and Options in Text Format\n\n"
                 )
 
-                f.write(f"{q['question_text'].strip()}\n\n")
+                q_body = (q.get("question_text") or "").strip()
+                f.write(f"{q_body}\n\n")
 
-                opts = q["options"]
-                opt_str = f"A. {opts['A']} B. {opts['B']} C. {opts['C']} D. {opts['D']}"
+                opts = q.get("options") or {}
+                opt_str = (
+                    f"A. {opts.get('A') or ''} B. {opts.get('B') or ''} "
+                    f"C. {opts.get('C') or ''} D. {opts.get('D') or ''}"
+                )
                 f.write(f"{opt_str.strip()}\n\n")
 
                 f.write("Detailed Explanation of the Question and Right Answer\n\n")
diff --git a/content_gen/scripts/extraction/kit/wrapper.py b/content_gen/scripts/extraction/kit/wrapper.py
index 1e28306..6a36a7e 100644
--- a/content_gen/scripts/extraction/kit/wrapper.py
+++ b/content_gen/scripts/extraction/kit/wrapper.py
@@ -20,9 +20,9 @@
 
 
 class PDFExtractKitWrapper(
-    KitPageProcessorMixin,
     KitTextUtilsMixin,
     KitImageUtilsMixin,
+    KitPageProcessorMixin,
     KitQuestionBuilderMixin,
 ):
     """
diff --git a/content_gen/tests/test_regression_guards.py b/content_gen/tests/test_regression_guards.py
index 78f9c6f..3c16242 100644
--- a/content_gen/tests/test_regression_guards.py
+++ b/content_gen/tests/test_regression_guards.py
@@ -11,6 +11,9 @@ def _wrapper_without_init() -> PDFExtractKitWrapper:
     wrapper.min_question_number = 1
     wrapper.max_question_number = 40
     wrapper.question_detection_mode = "balanced"
+    wrapper.extraction_noise_patterns = []
+    wrapper.outputs_dir = None
+    wrapper.base_name = None
     return wrapper
 
 
@@ -106,6 +109,65 @@ def test_parse_response_returns_empty_for_multi_without_headers():
     assert parsed == {}
 
 
+def test_reconstruct_line_text_handles_none_span_text():
+    wrapper = _wrapper_without_init()
+    spans = [
+        {"text": None, "size": 12.0, "bbox": [0.0, 10.0, 10.0, 20.0]},
+        {"text": "stem", "size": 12.0, "bbox": [12.0, 10.0, 40.0, 20.0]},
+    ]
+    assert wrapper._reconstruct_line_text(spans, 15.0, 12.0) == "stem"
+
+
+def test_clean_noise_accepts_none():
+    wrapper = _wrapper_without_init()
+    assert wrapper._clean_noise(None) == ""
+
+
+def test_generate_processed_text_tolerates_null_question_and_options(tmp_path: Path):
+    wrapper = _wrapper_without_init()
+    wrapper.outputs_dir = tmp_path
+    wrapper.base_name = "nullsafe"
+    wrapper._generate_processed_text(
+        {
+            "questions": [
+                {
+                    "question_number": 1,
+                    "question_text": None,
+                    "options": {"A": None, "B": "", "C": "", "D": ""},
+                }
+            ]
+        }
+    )
+    out = tmp_path / "nullsafe_processed.txt"
+    assert out.exists()
+    body = out.read_text(encoding="utf-8")
+    assert "Question 1" in body
+    assert "A." in body
+
+
+def test_kit_adapter_coerces_null_question_text_and_options(tmp_path: Path):
+    adapter = KitExtractionAdapter.__new__(KitExtractionAdapter)
+    adapter.default_subject = "General"
+    adapter.wrapper = MagicMock()
+    adapter.wrapper.extract_questions.return_value = {
+        "questions": [
+            {
+                "question_number": 1,
+                "question_text": None,
+                "options": {"A": None, "B": "beta"},
+                "stem_images": [],
+                "option_images": {},
+            }
+        ]
+    }
+
+    result = adapter.extract_content(tmp_path / "source.pdf", tmp_path)
+    assert result[0].question_text == ""
+    assert result[0].options["A"] == ""
+    assert result[0].options["B"] == "beta"
+    assert result[0].options.get("C") == ""
+
+
 def test_validate_generated_content_flags_missing_sections():
     generator = ContentGenerator(router=MagicMock())
     bad = generator._validate_generated_content({
diff --git a/qc_viewer/routers/automation.py b/qc_viewer/routers/automation.py
index 91a692e..2ebb9a4 100644
--- a/qc_viewer/routers/automation.py
+++ b/qc_viewer/routers/automation.py
@@ -276,9 +276,9 @@ async def get_metrics():
 
 @router.get("/api/automate/config")
 async def get_config():
-    import yaml
     from pathlib import Path
 
+    from content_gen.core.config_loader import ConfigLoader
     from qc_viewer.config import PROJECT_ROOT
 
     config_path = PROJECT_ROOT / "edmate_config.yaml"
@@ -288,16 +288,18 @@ async def get_config():
     model_routing: dict = {}
     kit_present = False
 
-    if config_path.exists():
-        try:
-            with open(config_path, "r") as f:
-                data = yaml.safe_load(f) or {}
-                workspace_data = data.get("workspace", {}) or {}
-                budget_data = data.get("budget", {}) or {}
-                extraction_settings = data.get("extraction_settings", {}) or {}
-                model_routing = data.get("model_routing", {}) or {}
-        except Exception as e:
-            print(f"Error loading edmate_config.yaml: {e}")
+    try:
+        ec = ConfigLoader.load_config(config_path if config_path.exists() else None)
+        if hasattr(ec, "model_dump"):
+            merged = ec.model_dump(mode="json")
+        else:
+            merged = json.loads(ec.json())  # type: ignore[attr-defined]
+        workspace_data = merged.get("workspace") or {}
+        budget_data = merged.get("budget") or {}
+        extraction_settings = merged.get("extraction_settings") or {}
+        model_routing = merged.get("model_routing") or {}
+    except Exception as e:
+        print(f"Error loading validated edmate_config: {e}")
 
     kit_path = Path(PROJECT_ROOT) / "content_gen" / "tools" / "PDF-Extract-Kit"
     kit_present = kit_path.is_dir() and (kit_path / "pdf_extract_kit").is_dir()
diff --git a/qc_viewer/services/automation_pipeline.py b/qc_viewer/services/automation_pipeline.py
index 0833996..8b12686 100644
--- a/qc_viewer/services/automation_pipeline.py
+++ b/qc_viewer/services/automation_pipeline.py
@@ -1,6 +1,5 @@
 import asyncio
 import base64
-import json
 import os
 import re
 import threading
@@ -13,10 +12,10 @@
 from content_gen.core.config_schema import DetectionMode
 from content_gen.core.pedagogy_engine import PedagogyEngine
 from content_gen.scripts.pipeline.pipeline_orchestrator import PipelineOrchestrator
+from qc_viewer.services.draft_store import read_modify_write_json
 
 
 CANCELLATION_EVENTS: dict[str, threading.Event] = {}
-METADATA_LOCK = threading.Lock()
 
 
 def _normalize_model_id(model_id: str, provider: Optional[str]) -> str:
@@ -178,10 +177,7 @@ def _update_progress(progress: int, message: str, processed_count: Optional[int]
             raise InterruptedError(f"Task {draft_id} was cancelled by user.")
 
         try:
-            with METADATA_LOCK:
-                with open(meta_path, "r") as f:
-                    meta = json.load(f)
-                
+            def _mut(meta: dict) -> None:
                 update_data = {
                     "progress": progress,
                     "status_message": message,
@@ -191,11 +187,9 @@ def _update_progress(progress: int, message: str, processed_count: Optional[int]
                     update_data["processed_count"] = processed_count
                 if total_count is not None:
                     update_data["total_count"] = total_count
-                
                 meta.update(update_data)
-                
-                with open(meta_path, "w") as f:
-                    json.dump(meta, f)
+
+            read_modify_write_json(meta_path, _mut)
         except Exception as e:
             print(f"Error updating progress: {e}")
 
@@ -312,6 +306,13 @@ def _update_progress(progress: int, message: str, processed_count: Optional[int]
             if clean_core_concept.lower() in explanation_text.lower() and len(clean_core_concept) > len(explanation_text) * 0.8:
                 clean_core_concept = "Concept extracted from explanation."
 
+            opts_map = q.options if isinstance(q.options, dict) else {}
+            opt_vals = [str(opts_map.get(k, "") or "").strip() for k in ("A", "B", "C", "D")]
+            non_empty_opts = sum(1 for v in opt_vals if v)
+            extraction_warnings = (
+                ["mcq_options_missing"] if non_empty_opts < 2 else []
+            )
+
             legacy_q = {
                 "question_number": q.question_number,
                 "text": q.question_text,
@@ -328,6 +329,8 @@ def _update_progress(progress: int, message: str, processed_count: Optional[int]
                 "quality_report": quality_report,
                 "contract_warnings": [k for k, v in quality_report.items() if v is False],
             }
+            if extraction_warnings:
+                legacy_q["extraction_warnings"] = extraction_warnings
             questions_payload.append(legacy_q)
 
         t_normalization_end = time.time()
@@ -342,53 +345,56 @@ def _update_progress(progress: int, message: str, processed_count: Optional[int]
             }
         }
 
-        with open(meta_path, "r") as f:
-            final_meta = json.load(f)
-
-        final_meta.update(
-            {
-                "questions": questions_payload,
-                "status": "PROCESSED",
-                "progress": 100,
-                "processed_count": total_questions,
-                "total_count": total_questions,
-                "status_message": "Generation complete!",
-                "id": draft_id,
-                "subject": subject,
-                "paper_code": paper_code,
-                "pedagogy_profile": pedagogy.get_profile_summary(),
-                "resolved_model_override": resolved_model_override,
-                "completed_at": datetime.now().isoformat(),
-                "telemetry": telemetry,
-            }
-        )
+        def _finalize(meta: dict) -> None:
+            meta.update(
+                {
+                    "questions": questions_payload,
+                    "status": "PROCESSED",
+                    "progress": 100,
+                    "processed_count": total_questions,
+                    "total_count": total_questions,
+                    "status_message": "Generation complete!",
+                    "id": draft_id,
+                    "subject": subject,
+                    "paper_code": paper_code,
+                    "pedagogy_profile": pedagogy.get_profile_summary(),
+                    "resolved_model_override": resolved_model_override,
+                    "completed_at": datetime.now().isoformat(),
+                    "telemetry": telemetry,
+                }
+            )
 
-        with open(meta_path, "w") as f:
-            json.dump(final_meta, f)
+        read_modify_write_json(meta_path, _finalize)
 
     except InterruptedError:
         print(f"Task {draft_id} cancelled.")
-        _update_progress(0, "Processing stopped by user.")
-        with open(meta_path, "r") as f:
-            meta = json.load(f)
-        meta["status"] = "FAILED"
-        meta["status_message"] = "Stopped by user"
-        with open(meta_path, "w") as f:
-            json.dump(meta, f)
+        try:
+            read_modify_write_json(
+                meta_path,
+                lambda m: m.update(
+                    {
+                        "progress": 0,
+                        "status_message": "Processing stopped by user.",
+                        "status": "FAILED",
+                    }
+                ),
+            )
+        except Exception as inner_e:
+            print(f"Failed to update metadata after cancel: {inner_e}")
     except Exception as e:
         print(f"Background Processing Error: {e}")
         try:
-            with open(meta_path, "r") as f:
-                fail_meta = json.load(f)
-            fail_meta.update(
-                {
-                    "status": "FAILED",
-                    "error": str(e),
-                    "progress": 0,
-                    "status_message": f"Error: {str(e)}",
-                }
-            )
-            with open(meta_path, "w") as f:
-                json.dump(fail_meta, f)
+
+            def _fail(meta: dict) -> None:
+                meta.update(
+                    {
+                        "status": "FAILED",
+                        "error": str(e),
+                        "progress": 0,
+                        "status_message": f"Error: {str(e)}",
+                    }
+                )
+
+            read_modify_write_json(meta_path, _fail)
         except Exception as inner_e:
             print(f"Failed to update metadata with error: {inner_e}")
diff --git a/qc_viewer/services/draft_store.py b/qc_viewer/services/draft_store.py
index 94b8cd1..c18a3e4 100644
--- a/qc_viewer/services/draft_store.py
+++ b/qc_viewer/services/draft_store.py
@@ -1,8 +1,9 @@
 import json
+import os
 import shutil
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any, Callable, Optional
 import threading
 
 from fastapi import HTTPException
@@ -50,6 +51,24 @@ def write_json(path: Path, payload: dict[str, Any]) -> None:
             json.dump(payload, f)
 
 
+def read_modify_write_json(path: Path, mutator: Callable[[dict[str, Any]], None]) -> None:
+    """
+    Read JSON, apply mutator in-place, then atomically replace the file.
+    Holds METADATA_LOCK for the whole operation so callers never read a torn write.
+    """
+    with METADATA_LOCK:
+        if path.exists():
+            with open(path, "r", encoding="utf-8") as f:
+                data: dict[str, Any] = json.load(f)
+        else:
+            data = {}
+        mutator(data)
+        tmp = path.with_suffix(path.suffix + ".tmp")
+        with open(tmp, "w", encoding="utf-8") as f:
+            json.dump(data, f)
+        os.replace(tmp, path)
+
+
 def list_draft_metadata() -> list[dict[str, Any]]:
     drafts: list[dict[str, Any]] = []
     if not DRAFTS_ROOT.exists():
diff --git a/qc_viewer/static/automate.html b/qc_viewer/static/automate.html
index db90308..3879ea4 100644
--- a/qc_viewer/static/automate.html
+++ b/qc_viewer/static/automate.html
@@ -64,9 +64,9 @@ <h2>Live Preview</h2>
                     <button class="btn btn-primary btn-sm" id="btnAcceptAll">Accept All</button>
                     <button class="btn btn-outline btn-sm" id="btnToggleEdit">✏ Edit Mode</button>
                     <button class="btn btn-accent btn-sm" id="btnSaveEdits" style="display:none;">💾 Save</button>
-                    <div class="export-menu" style="position:relative; display:inline-block;">
+                    <div class="export-menu">
                         <button type="button" class="btn btn-outline btn-sm" id="btnExportToggle" title="Choose export format">📥 Export ▾</button>
-                        <div id="exportMenu" class="export-dropdown" style="display:none; position:absolute; right:0; top:100%; margin-top:4px; min-width:220px; z-index:50; background:var(--card-bg, #1e293b); border:1px solid var(--card-border, #334155); border-radius:8px; padding:6px; box-shadow:0 8px 24px rgba(0,0,0,0.35); flex-direction:column; gap:4px;">
+                        <div id="exportMenu" class="export-dropdown">
                             <button type="button" class="btn btn-outline btn-sm" data-fmt="json" style="width:100%; justify-content:flex-start;">JSON</button>
                             <button type="button" class="btn btn-outline btn-sm" data-fmt="csv" style="width:100%; justify-content:flex-start;">CSV</button>
                             <button type="button" class="btn btn-outline btn-sm" data-fmt="markdown" style="width:100%; justify-content:flex-start;">Markdown (.md)</button>
@@ -212,17 +212,17 @@ <h2 style="font-family:'Outfit'; font-size:1.4rem;">Pipeline Settings</h2>
                     <button type="button" id="btnRefreshPipelineConfig" class="btn btn-outline btn-sm" title="Reload edmate_config.yaml from disk">Refresh config</button>
                 </div>
                 <dl id="configSnapshotDl" style="margin:0; font-size:0.78rem; line-height:1.5; color:var(--text-dim); display:grid; grid-template-columns:auto 1fr; gap:4px 12px;">
-                    <dt style="margin:0; color:var(--text-muted);">Engine</dt><dd style="margin:0;" id="cfgEngine">—</dd>
-                    <dt style="margin:0; color:var(--text-muted);">Detection</dt><dd style="margin:0;" id="cfgDetection">—</dd>
-                    <dt style="margin:0; color:var(--text-muted);">Kit</dt><dd style="margin:0;" id="cfgKit">—</dd>
-                    <dt style="margin:0; color:var(--text-muted);">Question range</dt><dd style="margin:0;" id="cfgQuestionRange">—</dd>
-                    <dt style="margin:0; color:var(--text-muted);">Segmentation</dt><dd style="margin:0;" id="cfgSegmentation">—</dd>
-                    <dt style="margin:0; color:var(--text-muted);">Default subject</dt><dd style="margin:0;" id="cfgSubject">—</dd>
-                    <dt style="margin:0; color:var(--text-muted);">Default curriculum</dt><dd style="margin:0;" id="cfgCurriculum">—</dd>
-                    <dt style="margin:0; color:var(--text-muted);">Budget cap (USD/day)</dt><dd style="margin:0;" id="cfgBudget">—</dd>
-                    <dt style="margin:0; color:var(--text-muted);">Model · extraction</dt><dd style="margin:0; word-break:break-all;" id="cfgModelExt">—</dd>
-                    <dt style="margin:0; color:var(--text-muted);">Model · generation</dt><dd style="margin:0; word-break:break-all;" id="cfgModelGen">—</dd>
-                    <dt style="margin:0; color:var(--text-muted);">Model · validation</dt><dd style="margin:0; word-break:break-all;" id="cfgModelVal">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Engine <span class="info-icon" data-tooltip="extraction_settings.engine from edmate_config.yaml (e.g. pdf_extract_kit, vision, pymupdf).">ⓘ</span></dt><dd style="margin:0;" id="cfgEngine">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Detection <span class="info-icon" data-tooltip="question_detection_mode: how strictly question numbers are matched in the PDF. strict = exact patterns; balanced = default; open = more inference.">ⓘ</span></dt><dd style="margin:0;" id="cfgDetection">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Kit <span class="info-icon" data-tooltip="Whether the PDF-Extract-Kit repo is present under content_gen/tools/PDF-Extract-Kit (layout/diagram pipeline). Not used by vision-only engines.">ⓘ</span></dt><dd style="margin:0;" id="cfgKit">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Question range <span class="info-icon" data-tooltip="min_question_number / max_question_number: optional filter so only questions in that inclusive range are extracted.">ⓘ</span></dt><dd style="margin:0;" id="cfgQuestionRange">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Segmentation preset <span class="info-icon" data-tooltip="Heuristic preset for splitting text into questions—not a country. bangladeshi = section headers + numbered items; numbered_only = numbered lines without section blocks.">ⓘ</span></dt><dd style="margin:0;" id="cfgSegmentation">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Default subject <span class="info-icon" data-tooltip="workspace.default_subject fallback when the upload does not specify a subject label.">ⓘ</span></dt><dd style="margin:0;" id="cfgSubject">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Default curriculum <span class="info-icon" data-tooltip="workspace.default_curriculum used as prompt context when none is selected.">ⓘ</span></dt><dd style="margin:0;" id="cfgCurriculum">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Budget cap (USD/day) <span class="info-icon" data-tooltip="budget.max_daily_usd from config (tracking hooks may extend later).">ⓘ</span></dt><dd style="margin:0;" id="cfgBudget">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Model · extraction <span class="info-icon" data-tooltip="model_routing.extraction: provider/model id for extraction-related LLM steps.">ⓘ</span></dt><dd style="margin:0; word-break:break-all;" id="cfgModelExt">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Model · generation <span class="info-icon" data-tooltip="model_routing.generation: provider/model for explanations and generated teaching content.">ⓘ</span></dt><dd style="margin:0; word-break:break-all;" id="cfgModelGen">—</dd>
+                    <dt style="margin:0; color:var(--text-dim);">Model · validation <span class="info-icon" data-tooltip="model_routing.validation: provider/model for validation or QA-style checks when enabled.">ⓘ</span></dt><dd style="margin:0; word-break:break-all;" id="cfgModelVal">—</dd>
                 </dl>
             </div>
         </div>
diff --git a/qc_viewer/static/css/modules/components.css b/qc_viewer/static/css/modules/components.css
index a8eca57..f448852 100644
--- a/qc_viewer/static/css/modules/components.css
+++ b/qc_viewer/static/css/modules/components.css
@@ -450,3 +450,57 @@ select {
     opacity: 1;
     visibility: visible;
 }
+
+/* Export format menus: solid background so dark theme stays readable */
+.export-menu {
+    position: relative;
+    display: inline-block;
+}
+
+.export-dropdown {
+    display: none;
+    position: absolute;
+    right: 0;
+    top: 100%;
+    margin-top: 4px;
+    min-width: 220px;
+    z-index: 1200;
+    background: var(--popover-bg);
+    border: 1px solid var(--card-border);
+    border-radius: 8px;
+    padding: 6px;
+    box-shadow: 0 8px 24px rgba(0, 0, 0, 0.35);
+    flex-direction: column;
+    gap: 4px;
+}
+
+.export-dropdown .btn-outline {
+    background: rgba(255, 255, 255, 0.04);
+}
+
+[data-theme="light"] .export-dropdown .btn-outline {
+    background: rgba(15, 23, 42, 0.04);
+}
+
+.export-dropdown .btn-outline:hover {
+    background: rgba(255, 255, 255, 0.1);
+}
+
+[data-theme="light"] .export-dropdown .btn-outline:hover {
+    background: rgba(15, 23, 42, 0.08);
+}
+
+.draft-export-popover {
+    background: var(--popover-bg) !important;
+    border: 1px solid var(--card-border);
+    border-radius: 8px;
+    box-shadow: 0 8px 24px rgba(0, 0, 0, 0.35);
+}
+
+.draft-export-popover .btn-outline {
+    background: rgba(255, 255, 255, 0.04);
+}
+
+[data-theme="light"] .draft-export-popover .btn-outline {
+    background: rgba(15, 23, 42, 0.04);
+}
diff --git a/qc_viewer/static/css/modules/review.css b/qc_viewer/static/css/modules/review.css
index f58316f..ed27414 100644
--- a/qc_viewer/static/css/modules/review.css
+++ b/qc_viewer/static/css/modules/review.css
@@ -124,9 +124,14 @@
     display: grid;
     grid-template-columns: 1fr 1fr;
     gap: 40px;
+    min-width: 0;
     animation: panelSlideUp 0.6s cubic-bezier(0.16, 1, 0.3, 1);
 }
 
+.review-panel.active > .panel-column {
+    min-width: 0;
+}
+
 @keyframes panelSlideUp {
     from { transform: translateY(30px); opacity: 0; }
     to { transform: translateY(0); opacity: 1; }
@@ -148,6 +153,8 @@
     border-radius: 12px;
     border: 1px solid var(--card-border);
     box-shadow: 0 10px 40px rgba(0,0,0,0.1);
+    min-width: 0;
+    flex: 1;
 }
 
 .card-render h2 { color: var(--bg); margin-bottom: 15px; }
@@ -191,6 +198,7 @@
 /* Rendered Preview Box */
 .preview-render-box {
     width: 100%;
+    max-width: 100%;
     background: var(--bg);
     border: 1px solid var(--card-border);
     border-radius: 8px;
@@ -202,6 +210,46 @@
     min-height: 40px;
     line-height: 1.6;
     white-space: normal;
+    overflow-wrap: anywhere;
+    word-break: break-word;
+}
+
+.mcq-options-grid {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 10px;
+    margin-top: 10px;
+    max-width: 100%;
+}
+
+.mcq-options-grid .opt-field {
+    min-width: 0;
+}
+
+.extraction-warn-banner {
+    font-size: 0.78rem;
+    line-height: 1.45;
+    color: #fdba74;
+    background: rgba(249, 115, 22, 0.12);
+    border: 1px solid rgba(249, 115, 22, 0.35);
+    border-radius: 8px;
+    padding: 10px 12px;
+    margin-bottom: 14px;
+}
+
+.extraction-warn-inline {
+    margin-left: 6px;
+    font-size: 0.75rem;
+    color: #fb923c;
+}
+
+@media (max-width: 1100px) {
+    .review-panel.active {
+        grid-template-columns: 1fr;
+    }
+    .mcq-options-grid {
+        grid-template-columns: 1fr;
+    }
 }
 
 .preview-render-box h1, .preview-render-box h2, .preview-render-box h3 {
diff --git a/qc_viewer/static/css/modules/variables.css b/qc_viewer/static/css/modules/variables.css
index 3ebb107..24c9bcf 100644
--- a/qc_viewer/static/css/modules/variables.css
+++ b/qc_viewer/static/css/modules/variables.css
@@ -26,6 +26,8 @@
     --glass: rgba(17, 24, 39, 0.6);
     --glass-border: rgba(251, 191, 36, 0.2);
     --grid-color: rgba(251, 191, 36, 0.05); /* Increased opacity */
+    /* Opaque menus/popovers (--card-bg is translucent in dark theme) */
+    --popover-bg: #1e293b;
 }
 
 [data-theme="light"] {
@@ -42,6 +44,7 @@
     --glass: rgba(255, 255, 255, 0.7);
     --glass-border: rgba(17, 24, 39, 0.15);
     --grid-color: rgba(251, 191, 36, 0.12); /* Increased opacity */
+    --popover-bg: #ffffff;
 }
 
 * {
diff --git a/qc_viewer/static/js/automate_ui.js b/qc_viewer/static/js/automate_ui.js
index bab6be4..0258036 100644
--- a/qc_viewer/static/js/automate_ui.js
+++ b/qc_viewer/static/js/automate_ui.js
@@ -48,8 +48,6 @@ export const AutomationUI = {
                     ).join('');
                 }
 
-                // Re-init tooltips for dynamic content
-                this.setupTooltips();
             }
 
             const engine = (config.extraction_settings && config.extraction_settings.engine) || 'unknown';
@@ -60,14 +58,23 @@ export const AutomationUI = {
             const banner = document.getElementById('extractionContextBanner');
             if (banner) {
                 const safeEngine = String(engine).replace(/</g, '&lt;');
-                const parts = [
-                    `<strong>Active extraction engine:</strong> ${safeEngine}`,
-                    mode ? `<span> · detection: ${String(mode)}</span>` : '',
-                    `<span> · PDF-Extract-Kit: ${kit}</span>`,
-                    hint ? `<br>${hint}` : '',
-                    warn ? `<br><strong style="color:#f97316;">${warn}</strong>` : '',
-                ];
-                banner.innerHTML = parts.join('');
+                const engKey = String(engine).toLowerCase();
+                let mainLine = '';
+                if (engKey === 'pdf_extract_kit') {
+                    mainLine = `<strong>Active extraction engine:</strong> PDF-Extract-Kit <span style="opacity:0.72;font-size:0.82em;">(pdf_extract_kit)</span> · kit: ${kit}`;
+                } else {
+                    mainLine = `<strong>Active extraction engine:</strong> ${safeEngine}`;
+                }
+                const det = mode ? ` <span>· detection: ${String(mode).replace(/</g, '&lt;')}</span>` : '';
+                const hintHtml = hint ? `<br>${String(hint).replace(/</g, '&lt;')}` : '';
+                const warnHtml = warn ? `<br><strong style="color:#f97316;">${String(warn).replace(/</g, '&lt;')}</strong>` : '';
+                const bannerTip =
+                    'Backend from edmate_config.yaml. For PDF-Extract-Kit, kit means the local checkout under content_gen/tools/PDF-Extract-Kit (layout/diagram support). Other engines do not use that directory.';
+                banner.innerHTML = `
+                    <div style="display:flex;align-items:flex-start;gap:10px;flex-wrap:wrap;">
+                        <div style="flex:1;min-width:0;">${mainLine}${det}${hintHtml}${warnHtml}</div>
+                        <span class="info-icon" data-tooltip="${bannerTip.replace(/"/g, '&quot;')}">ⓘ</span>
+                    </div>`;
             }
             const footer = document.getElementById('settingsEngineFooter');
             if (footer) {
@@ -95,13 +102,23 @@ export const AutomationUI = {
             setTxt('cfgDetection', mode || '—');
             setTxt('cfgKit', kit);
             setTxt('cfgQuestionRange', qRange);
-            setTxt('cfgSegmentation', es.segmentation_preset);
             setTxt('cfgSubject', ws.default_subject);
             setTxt('cfgCurriculum', ws.default_curriculum);
             setTxt('cfgBudget', bud.max_daily_usd != null ? String(bud.max_daily_usd) : '—');
             setTxt('cfgModelExt', mr.extraction);
             setTxt('cfgModelGen', mr.generation);
             setTxt('cfgModelVal', mr.validation);
+
+            const segRaw = (es.segmentation_preset || '').toString().trim().toLowerCase();
+            const segLabel =
+                segRaw === 'bangladeshi'
+                    ? 'Sections + numbered (legacy id: bangladeshi)'
+                    : segRaw === 'numbered_only'
+                      ? 'Numbered questions only'
+                      : segRaw || '—';
+            setTxt('cfgSegmentation', segLabel);
+
+            this.setupTooltips();
         } catch (e) {
             console.error('Error loading pipeline config:', e);
         }
@@ -217,8 +234,9 @@ export const AutomationUI = {
             document.body.appendChild(tooltip);
         }
 
-        const icons = document.querySelectorAll('.info-icon[data-tooltip]');
+        const icons = document.querySelectorAll('.info-icon[data-tooltip]:not([data-tooltip-bound])');
         icons.forEach(icon => {
+            icon.setAttribute('data-tooltip-bound', '1');
             icon.addEventListener('mouseenter', (e) => {
                 const text = icon.getAttribute('data-tooltip');
                 const rect = icon.getBoundingClientRect();
diff --git a/qc_viewer/static/js/controllers/drafts.js b/qc_viewer/static/js/controllers/drafts.js
index c4b589e..f2c4e75 100644
--- a/qc_viewer/static/js/controllers/drafts.js
+++ b/qc_viewer/static/js/controllers/drafts.js
@@ -60,7 +60,7 @@ export const DraftController = {
                             <div class="mini-progress-container" style="width: 200px; height: 4px; background: #334155; border-radius: 2px; margin-top: 8px; overflow: hidden;">
                                 <div style="width: 10%; height: 100%; background: var(--primary-light); transition: width 0.8s cubic-bezier(0.4, 0, 0.2, 1);"></div>
                             </div>
-                            <span style="font-size: 0.7rem; color: var(--primary-light);">10% complete</span>
+                            <span class="draft-progress-pct" style="font-size: 0.7rem; color: var(--primary-light);">10% complete</span>
                         </div>
                         <div style="display: flex; align-items: center; gap: 16px;">
                             <span class="status-badge status-processing">PROCESSING</span>
@@ -111,6 +111,9 @@ export const DraftController = {
             this.renderDrafts(drafts);
         } catch (error) {
             console.error('Fetch failed:', error);
+            if (typeof this.showToast === 'function') {
+                this.showToast('Could not refresh drafts', 'danger');
+            }
         }
     },
 
@@ -161,7 +164,7 @@ export const DraftController = {
                         <div class="mini-progress-container" style="width: 200px; height: 4px; background: #334155; border-radius: 2px; margin-top: 8px; overflow: hidden;">
                             <div style="width: ${d.progress || 0}%; height: 100%; background: var(--primary-light); transition: width 0.8s cubic-bezier(0.4, 0, 0.2, 1);"></div>
                         </div>
-                        <span style="font-size: 0.7rem; color: var(--primary-light);">${d.progress || 0}% complete</span>
+                        <span class="draft-progress-pct" style="font-size: 0.7rem; color: var(--primary-light);">${d.progress || 0}% complete</span>
                     ` : ''}
                 </div>
                 <div style="display: flex; align-items: center; gap: 16px;">
@@ -180,7 +183,7 @@ export const DraftController = {
                 if (e.target.closest('.action-buttons')) return;
                 const id = card.dataset.id;
                 const d = drafts.find(x => x.id === id);
-                if (d.status === 'PROCESSED') this.openReview(id);
+                if (d.status === 'PROCESSED' || d.status === 'REVIEW_READY') this.openReview(id);
             };
         });
 
@@ -226,12 +229,12 @@ export const DraftController = {
                 const data = JSON.parse(event.data);
                 this.updateDraftUI(data);
                 
-                if (data.status === 'PROCESSED' || data.status === 'FAILED') {
+                if (data.status === 'PROCESSED' || data.status === 'FAILED' || data.status === 'PUBLISHED') {
                     console.log(`✅ Stream complete for ${draftId}`);
                     eventSource.close();
                     delete this.activeStreams[draftId];
-                    // Final fetch to sync everything
-                    setTimeout(() => this.fetchDrafts(), 1000);
+                    this.fetchDrafts();
+                    setTimeout(() => this.fetchDrafts(), 900);
                 }
             } catch (e) {
                 console.error('SSE Parse Error:', e);
@@ -246,32 +249,31 @@ export const DraftController = {
     },
 
     updateDraftUI(d) {
-        // 1. (Removed top-level progress bar update as per UAC)
-
-        // 2. Update the specific draft card
         const card = document.querySelector(`.draft-card[data-id="${d.id}"]`);
         if (!card) return;
 
-        // Update progress bar
+        const status = d.status || '';
+        const isProcessing = status === 'PROCESSING' || status === 'EXTRACTING';
+
         const bar = card.querySelector('.mini-progress-container div');
         if (bar) bar.style.width = `${d.progress || 0}%`;
 
-        // Update percentage text
-        const pctText = card.querySelector('.draft-info span[style*="color: var(--primary-light)"]');
+        const pctText = card.querySelector('.draft-progress-pct')
+            || card.querySelector('.draft-info span[style*="color: var(--primary-light)"]');
         if (pctText) pctText.textContent = `${d.progress || 0}% complete`;
 
-        // Update status message
         const statusMsgContainer = card.querySelector('.draft-info p');
-        let statusMsgSpan = statusMsgContainer.querySelector('.status-message-streaming');
-        if (!statusMsgSpan) {
-            statusMsgSpan = document.createElement('span');
-            statusMsgSpan.className = 'status-message-streaming';
-            statusMsgSpan.style.fontSize = '0.75rem';
-            statusMsgContainer.appendChild(statusMsgSpan);
+        if (statusMsgContainer) {
+            let statusMsgSpan = statusMsgContainer.querySelector('.status-message-streaming');
+            if (!statusMsgSpan) {
+                statusMsgSpan = document.createElement('span');
+                statusMsgSpan.className = 'status-message-streaming';
+                statusMsgSpan.style.fontSize = '0.75rem';
+                statusMsgContainer.appendChild(statusMsgSpan);
+            }
+            statusMsgSpan.textContent = ` • ${d.status_message || 'Processing...'}`;
         }
-        statusMsgSpan.textContent = ` • ${d.status_message || 'Processing...'}`;
-        
-        // Update question count if available
+
         const qCount = d.questions?.length || d.processed_count || 0;
         if (qCount > 0) {
             let badge = card.querySelector('.question-count-badge');
@@ -283,6 +285,50 @@ export const DraftController = {
             }
             badge.textContent = `${qCount} Questions`;
         }
+
+        if (status === 'PROCESSED' || status === 'FAILED' || status === 'PUBLISHED') {
+            card.classList.remove('processing-active');
+            const badgeEl = card.querySelector('.status-badge');
+            if (badgeEl) {
+                badgeEl.textContent = status;
+                badgeEl.className = `status-badge status-${String(status).toLowerCase()}`;
+            }
+            const mini = card.querySelector('.mini-progress-container');
+            const pctEl = card.querySelector('.draft-progress-pct')
+                || card.querySelector('.draft-info span[style*="color: var(--primary-light)"]');
+            if (mini) mini.style.display = 'none';
+            if (pctEl) pctEl.style.display = 'none';
+
+            const actions = card.querySelector('.action-buttons');
+            if (actions && typeof this.renderActionButton === 'function') {
+                const id = d.id;
+                actions.innerHTML = `${this.renderActionButton(d)}<button type="button" class="btn btn-outline btn-sm btn-delete" data-id="${id}" style="border:1px solid rgba(239,68,68,0.3); color:var(--danger)">Delete</button>`;
+                actions.querySelector('.btn-delete')?.addEventListener('click', (e) => {
+                    e.stopPropagation();
+                    this.deleteDraft(id);
+                });
+                actions.querySelector('.btn-review')?.addEventListener('click', (e) => {
+                    e.stopPropagation();
+                    this.openReview(id);
+                });
+                actions.querySelector('.btn-stop')?.addEventListener('click', (e) => {
+                    e.stopPropagation();
+                    this.stopProcessing(id);
+                });
+                const exportBtn = actions.querySelector('.btn-card-export');
+                exportBtn?.addEventListener('click', (e) => {
+                    e.stopPropagation();
+                    this.openDraftExportPopover(exportBtn, id);
+                });
+            }
+        } else if (isProcessing) {
+            card.classList.add('processing-active');
+            const mini = card.querySelector('.mini-progress-container');
+            const pctEl = card.querySelector('.draft-progress-pct')
+                || card.querySelector('.draft-info span[style*="color: var(--primary-light)"]');
+            if (mini) mini.style.display = '';
+            if (pctEl) pctEl.style.display = '';
+        }
     },
 
     renderActionButton(d) {
@@ -338,15 +384,11 @@ export const DraftController = {
         pop.style.cssText = [
             'position:fixed',
             'z-index:10050',
-            'background:var(--card-bg,#1e293b)',
-            'border:1px solid var(--card-border,#334155)',
-            'border-radius:8px',
             'padding:8px',
             'display:flex',
             'flex-direction:column',
             'gap:6px',
             'min-width:220px',
-            'box-shadow:0 8px 24px rgba(0,0,0,0.35)',
         ].join(';');
         const r = anchorEl.getBoundingClientRect();
         pop.style.top = `${Math.min(window.innerHeight - 120, r.bottom + 6)}px`;
diff --git a/qc_viewer/static/js/controllers/review.js b/qc_viewer/static/js/controllers/review.js
index e2134ce..555373d 100644
--- a/qc_viewer/static/js/controllers/review.js
+++ b/qc_viewer/static/js/controllers/review.js
@@ -25,7 +25,7 @@ export const ReviewController = {
         list.innerHTML = questions.map((q, i) => `
             <div class="draft-card question-item ${q.status === 'REJECTED' ? 'rejected' : ''}" data-index="${i}" style="margin-bottom:10px; ${this.currentQuestionIndex === i ? 'border-color:var(--primary)' : ''}">
                 <div style="flex:1">
-                    <b style="color:${q.status === 'REJECTED' ? 'var(--danger)' : 'var(--primary-light)'}">Q${q.question_number}</b>: 
+                    <b style="color:${q.status === 'REJECTED' ? 'var(--danger)' : 'var(--primary-light)'}">Q${q.question_number}</b>${(q.extraction_warnings && q.extraction_warnings.length) ? '<span class="extraction-warn-inline" title="Extraction may be incomplete (e.g. options)">⚠</span>' : ''}: 
                     ${q.text.substring(0, 50)}...
                 </div>
                 ${q.status !== 'INJECTED' ? `
@@ -65,13 +65,18 @@ export const ReviewController = {
         
         let typeSpecificHtml = '';
         const qType = q.type || 'mcq';
+        const extWarn = Array.isArray(q.extraction_warnings) && q.extraction_warnings.length > 0;
+        const warnBanner = extWarn
+            ? `<div class="extraction-warn-banner" role="status">Extraction note: some PDF fields (often MCQ options) could not be split reliably. Compare with the source PDF or use edit mode to fix.</div>`
+            : '';
 
         if (qType === 'mcq') {
             const opts = q.options || { A: '', B: '', C: '', D: '' };
             typeSpecificHtml = `
+                ${warnBanner}
                 <div style="margin-top:20px; border-top: 1px solid #e2e8f0; padding-top:12px;">
                     <b style="color:var(--primary); font-size: 0.75rem; text-transform:uppercase; letter-spacing:0.05em;">Options</b>
-                    <div style="display:grid; grid-template-columns: 1fr 1fr; gap:10px; margin-top:10px;">
+                    <div class="mcq-options-grid">
                         ${['A', 'B', 'C', 'D'].map(opt => `
                             <div class="edit-group opt-field" id="group-opt-${opt}">
                                 <label class="field-label" style="font-weight:700; text-transform:uppercase; font-size:0.7rem;">Option ${opt}</label>
@@ -120,6 +125,7 @@ export const ReviewController = {
         }
 
         preview.innerHTML = `
+            ${qType !== 'mcq' ? warnBanner : ''}
             <div class="edit-group" id="group-text">
                 <label class="field-label">Question Text</label>
                 <textarea class="editable-field" id="edit-text" style="height:80px;">${q.text}</textarea>