diff --git a/.ai-team/agents/colossus/history.md b/.ai-team/agents/colossus/history.md
index ca2788d40..020f01191 100644
--- a/.ai-team/agents/colossus/history.md
+++ b/.ai-team/agents/colossus/history.md
@@ -101,3 +101,11 @@ Added 5 missing smoke test InlineData entries to ControlSampleTests.cs covering
 
  Team update (2026-02-26): WebFormsPage unified wrapper  inherits NamingContainer, adds Theme cascading, replaces separate wrappers  decided by Jeffrey T. Fritz, Forge
  Team update (2026-02-26): SharedSampleObjects is the single source for sample data parity between Blazor and WebForms  decided by Jeffrey T. Fritz
+
+## Summary: PR #377 DetailsView Integration Test Fix (2026-02-26)
+
+Fixed 5 stale Customer→Product assertions in InteractiveComponentTests.cs after DetailsView sample pages migrated from Customer to Product model (SharedSampleObjects.Models.Product). Changes: "Customer Details"→"Product Details" (Styles), "Customer Record"→"Product Record" (Caption), "No customers found."→"No products found." (EmptyData), Customer field names→Product field names in EditMode assertion message. All 7 DetailsView integration tests passing.
+
+## Learnings
+
+- When sample data models change (e.g., Customer→Product), integration test assertions referencing model-specific text (header text, empty data messages, caption text, field name lists in assertion messages) must be updated in lockstep. Smoke tests won't catch these because they only verify page loads without errors — interactive tests with text-matching assertions are the ones that break.
diff --git a/.ai-team/agents/cyclops/history.md b/.ai-team/agents/cyclops/history.md
index 8fa07a1c3..aef9dd0f0 100644
--- a/.ai-team/agents/cyclops/history.md
+++ b/.ai-team/agents/cyclops/history.md
@@ -124,3 +124,19 @@
  Team update (2026-02-26): WebFormsPage unified wrapper  inherits NamingContainer, adds Theme cascading, replaces separate wrappers  decided by Jeffrey T. Fritz, Forge
  Team update (2026-02-26): SharedSampleObjects is the single source for sample data parity between Blazor and WebForms  decided by Jeffrey T. Fritz
  Team update (2026-02-26): Login+Identity controls deferred to future milestone  do not schedule implementation  decided by Jeffrey T. Fritz
+
+### M15 HTML Fidelity Bug Fixes (#380, #379, #378)
+
+- **BulletedList `<ol>` rendering (#380):** Removed HTML `type` attribute from `<ol>` element — WebForms uses CSS `list-style-type` only, not the HTML `type` attribute. Made `start` attribute conditional (only renders when `FirstBulletNumber != 1`). The `IsOrderedList` property and `ListStyleType` CSS mappings were already correct. Replaced `OrderedListType` property with `GetStartAttribute()` helper returning `int?` (null suppresses the attribute in Blazor).
+- **LinkButton `class` pass-through (#379):** Updated `GetCssClassOrNull()` in LinkButton.razor to add `aspNetDisabled` class when `Enabled=false`, matching the Button component's `CalculatedCssClass` pattern. Base CssClass pass-through was already working via the existing `GetCssClassOrNull()` method. Added 5 tests covering CssClass rendering, disabled state, and PostBackUrl+CssClass combo.
+- **Image `longdesc` conditional (#378):** The `GetLongDesc()` method in Image.razor already correctly returned null when `DescriptionUrl` was empty/unset, suppressing the `longdesc` attribute. Added 3 explicit tests verifying conditional rendering behavior. `DescriptionUrl` defaults to `string.Empty` in Image.razor.cs.
+- **Patterns followed:** Checked WebForms audit HTML to match exact attribute output. Followed Button's `CalculatedCssClass` pattern for disabled-state class handling. Used Blazor's null-attribute-suppression for conditional rendering (return null → attribute not rendered). All existing tests pass; added 10 new tests total.
+- **All 1277 tests pass**, 0 regressions.
+
+### M15 HTML Fidelity Closure Fixes (#383, #382, GridView default)
+
+- **FileUpload ID rendering (#383):** Verified that FileUpload renders the developer-set ID exactly (e.g., `id="myUpload"`) with no GUID suffix. In .NET 10, `InputFile` does not generate its own internal id — the `id` from `GetInputAttributes()` via `ClientID` is rendered as-is. When no ID is set, no `id` attribute is rendered. Added 2 regression tests in `FileUpload/IdRendering.razor`.
+- **CheckBox span wrapper removal (#382):** Verified that CheckBox renders `<input>` and `<label>` directly without a `<span>` wrapper (fixed in prior commit `3d84b4a`). CheckBoxList renders its own inline `<input>`/`<label>` pairs and does not use the CheckBox component, so no span dependency exists. Added 2 regression tests in `CheckBox/NoSpanWrapper.razor`.
+- **GridView UseAccessibleHeader default:** Changed `UseAccessibleHeader` default from `false` to `true` in `GridView.razor.cs`, matching WebForms behavior. WebForms defaults this to true, rendering `<th scope="col">` for header cells. The existing `UseAccessibleHeader_RendersThWithScope` test explicitly passed `UseAccessibleHeader="true"` and didn't catch the wrong default. Added 2 tests in `GridView/AccessibleHeaderDefault.razor` verifying default behavior and explicit false.
+- **Key learning:** When verifying WebForms fidelity, always test the default parameter values — passing `true` explicitly masks wrong defaults. CheckBoxList uses its own inline rendering, not the CheckBox component — changes to CheckBox don't affect CheckBoxList.
+- **All 1283 tests pass**, 0 regressions.
diff --git a/.ai-team/agents/forge/history.md b/.ai-team/agents/forge/history.md
index 2368cf163..e1d13968a 100644
--- a/.ai-team/agents/forge/history.md
+++ b/.ai-team/agents/forge/history.md
@@ -63,3 +63,37 @@ Created three-milestone plan for HTML fidelity audit per Jeff's directive. Key d
  Team update (2026-02-26): Menu RenderingMode=Table implemented with inline Razor for AngleSharp compatibility  decided by Cyclops
 
  Team update (2026-02-26): WebFormsPage unified wrapper design accepted and consolidated into decisions.md  decided by Jeffrey T. Fritz, Forge
+
+### Summary: M15 HTML Fidelity Strategy (2026-02-28)
+
+Post-PR #377 strategic assessment. PR #377 (M11–M14) merged to upstream/dev with full HTML audit (132 comparisons), 14 bug fixes, post-fix re-run (131 divergences, 1 exact match — Literal-3), WebFormsPage, NamingContainer.
+
+**Key findings:**
+1. The "1 exact match" number is misleading — vast majority of divergences are sample data differences, not component bugs. Estimated 15–20 controls would achieve exact match with sample alignment alone.
+2. 5 remaining fixable structural bugs: BulletedList (`<ol>` + `list-style-type`), LinkButton (`class` pass-through), Image (`longdesc`), FileUpload (GUID leak), CheckBox (`<span>` wrapper verification).
+3. 64 variants still missing Blazor captures — 25 of these just need `data-audit-control` markers on existing pages.
+4. 4 data controls (DataList, GridView, ListView, Repeater) need line-by-line investigation — mixed structural + sample parity issues.
+5. Calendar is closest complex control at 73% — needs style pass-through, day padding, title attribute work.
+
+**M15 scope recommended:** 12 work items covering: (1) P0 sample data alignment (~22 false positives eliminated), (2) P1 remaining bug fixes (BulletedList, LinkButton), (3) P2 fixes (Image, FileUpload, CheckBox, stable IDs), (4) P2 new Blazor markers (~25 new comparisons), (5) P3 normalizer enhancements, data control investigation, and full pipeline re-run. Target: ≥15 exact matches (up from 1).
+
+**Pixel-perfect realism:** ~13–15 controls can achieve exact normalized match. ~10 more can hit >90%. TreeView, Chart, Menu Table-mode, and event infrastructure are permanently divergent. Recommended definition: structural match after normalization of intentional divergences D-01 through D-10+.
+
+**New divergence candidates:** D-11 (GUID IDs — recommend fix, not register), D-12 (boolean attribute format — register as intentional), D-13 (Calendar day padding — recommend fix), D-14 (Calendar style pass-through — fix progressively).
+
+📌 Decision filed: `.ai-team/decisions/inbox/forge-m15-html-fidelity-strategy.md` — M15 scope proposal with 12 work items, 2–3 week estimate, target ≥15 exact matches.
+
+### Summary: M15-10 Data Control Deep Investigation (2026-02-28)
+
+Line-by-line classification of HTML divergences in DataList (106 lines), GridView (20 lines), ListView (106 lines), and Repeater (62 lines) using post-fix normalized captures.
+
+**Key findings:**
+1. 3 of 5 bugs from M13 analysis are now FIXED (PR #377): DataList border-collapse, GridView GridLines defaults, GridView border-collapse.
+2. 4 remaining genuine bugs: GridView `UseAccessibleHeader` default (false→should be true), GridView `&amp;nbsp;` encoding (ternary expression type issue), GridView `<thead>` vs WF's `<tbody>` for header rows, DataList missing `itemtype` from generic parameter.
+3. Sample parity is 22 of 26 findings — the Blazor samples use completely different templates, styles, and data formats. ListView and Repeater have ZERO component bugs; all divergences are sample authoring differences.
+4. After sample alignment alone: ListView and Repeater would achieve exact match. DataList would drop from 106 to ~5 diff lines. GridView from 20 to ~8.
+5. 2 normalizer gaps identified: inconsistent `<div>` wrapper stripping, empty `style=""` attributes not stripped.
+
+**New divergence candidate:** D-11 (Blazor uses `<thead>` for headers, WF uses `<tbody>` by default). Needs team decision — register as intentional or fix.
+
+📌 Decision filed: `.ai-team/decisions/inbox/forge-m15-data-control-analysis.md` — Data control investigation complete; 4 remaining bugs, sample alignment is critical path.
diff --git a/.ai-team/agents/jubilee/history.md b/.ai-team/agents/jubilee/history.md
index 68f26aaee..cd70dfa61 100644
--- a/.ai-team/agents/jubilee/history.md
+++ b/.ai-team/agents/jubilee/history.md
@@ -143,3 +143,37 @@ Chart: 8 basic + 4 advanced sample pages (DataBinding, MultiSeries, Styling, Cha
  Team update (2026-02-26): WebFormsPage unified wrapper  inherits NamingContainer, adds Theme cascading, replaces separate wrappers  decided by Jeffrey T. Fritz, Forge
  Team update (2026-02-26): SharedSampleObjects is the single source for sample data parity between Blazor and WebForms  decided by Jeffrey T. Fritz
  Team update (2026-02-26): Login+Identity controls deferred to future milestone  do not schedule samples  decided by Jeffrey T. Fritz
+
+### M15-01 — Sample Data Alignment for HTML Audit Matching (#381)
+
+- **14 Blazor sample pages aligned** to use identical text, values, URLs, and attributes as their WebForms counterparts. All changes are data-only (no component source code changes).
+- **Label:** "Hello World" (no comma/exclamation), "Styled Label" with `text-primary`/Blue/Bold, HTML content `<em>Emphasized</em>` variant.
+- **Literal:** PassThrough mode text `"This is <b>literal</b> content."`, Encode mode text `"This is <b>encoded</b> content."`, simple text unchanged.
+- **HiddenField:** Value changed from `"initial-secret-value"` to `"secret-value-123"`.
+- **PlaceHolder:** Content paragraphs changed to `"This content was added programmatically."` / `"PlaceHolder renders no HTML of its own."`.
+- **Panel:** Restructured all 3 audited variants — Panel-1 is now GroupingText="User Info" with Label+TextBox, Panel-2 is ScrollBars.Auto Height=100px with 4 paragraphs, Panel-3 is DefaultButton with TextBox+Button.
+- **HyperLink:** All 4 variants aligned — styled (Blue/White), tooltip ("Navigate to Bing!"), Visible=false, basic — all using `https://bing.com` and text "Blue Button".
+- **Image:** Changed to `/Content/Images/banner.png` src, "Banner image" and "Sized image" alt text, added Width/Height on Image-2.
+- **Button:** Changed from "Click me!" to "Blue Button" with BackColor=Blue ForeColor=White.
+- **CheckBox:** Labels changed to "Accept Terms", "Subscribe", "Enable Feature" (with AutoPostBack).
+- **DropDownList:** DDL-3 changed to data-bound First/Second/Third Item, DDL-4 disabled "Cannot change", DDL-5 styled "Styled" with form-select, DDL-6 colored "Colored dropdown" with Navy/LightYellow/200px.
+- **BulletedList:** BL-1 Disc with Apple/Banana/Cherry/Date, BL-2 Numbered with First/Second/Third, BL-3 Square HyperLink with Example Site/Example Org.
+- **LinkButton:** LB-1 "Click Me" with btn-primary, LB-2 "Submit Form", LB-3 "Disabled Link" with Enabled=false.
+- **ImageMap:** Changed to banner.png, "Navigate" alt, two rect hotspots (0,0,100,50 Bing + 100,0,200,50 GitHub).
+- **AdRotator:** Updated Ads.xml from CSharp/VB images to banner.png with Visit Bing/Visit GitHub ads matching WebForms ads.xml.
+- **Infrastructure:** Created `wwwroot/Content/Images/banner.png` for image path parity with WebForms `~/Content/Images/banner.png`.
+- **Key pattern:** The `data-audit-control` markers were preserved on all audited sections. Non-audited demo sections below were kept but updated to reference valid types/data.
+- **Limitation found:** Label-3 HTML content (`<em>Emphasized</em>`) — Blazor Label uses `@Text` which HTML-encodes, so the rendered output will differ from WebForms which renders raw HTML. This is a component-level issue requiring a component fix, not a sample data fix.
+
+### M15-08 — Add Audit Markers to Blazor Samples (#384)
+
+- **10 existing Blazor sample pages updated** with `data-audit-control` wrapper divs matching WebForms counterparts:
+  - ChangePassword (`ChangePassword-1`), Chart (`Chart`), CreateUserWizard (`CreateUserWizard-1`)
+  - Login (`Login-1`), LoginName (`LoginName-1`), LoginStatus (`LoginStatus-1`, `LoginStatus-2`)
+  - MultiView (`MultiView-1`), PasswordRecovery (`PasswordRecovery-1`, `PasswordRecovery-2`), Table (`Table-3`)
+- **2 new Blazor sample pages created** for controls that had WebForms samples but no Blazor equivalents:
+  - `DataPager/Index.razor` with `data-audit-control="DataPager"` — uses inline product data with paging demo
+  - `LoginView/Index.razor` with `data-audit-control="LoginView-1"` — shows AnonymousTemplate and LoggedInTemplate
+- **Audit coverage:** All WebForms controls with `data-audit-control` markers now have corresponding Blazor markers. Validator samples only have their first variant marked (matching the single-demo pattern already established).
+- **Key learning:** Blazor samples split across two paths — `Components/Pages/ControlSamples/` (current .NET 8 pattern) and legacy `Pages/ControlSamples/` (RadioButton, TextBox). New pages always go in `Components/Pages/`.
+- **Build verified:** `dotnet build samples/AfterBlazorServerSide/AfterBlazorServerSide.csproj -c Release` — 0 errors, 0 warnings.
diff --git a/.ai-team/decisions/inbox/cyclops-html-attribute-rendering.md b/.ai-team/decisions/inbox/cyclops-html-attribute-rendering.md
new file mode 100644
index 000000000..e6bc6f7f1
--- /dev/null
+++ b/.ai-team/decisions/inbox/cyclops-html-attribute-rendering.md
@@ -0,0 +1,17 @@
+# Decision: Conditional HTML attribute rendering pattern
+
+**Author:** Cyclops
+**Date:** M15
+**Context:** Bug fixes #380, #379, #378
+
+## Decision
+
+For conditional HTML attribute rendering in Blazor components:
+
+1. **Use helper methods returning null** to suppress attributes (e.g., `GetLongDesc()`, `GetCssClassOrNull()`). Blazor does not render attributes with null values.
+2. **For ordered lists**, use CSS `list-style-type` only — do NOT use the HTML `type` attribute on `<ol>`. WebForms doesn't render `type`.
+3. **Disabled state class handling** on button-like components should follow the Button pattern: append `aspNetDisabled` to CssClass when `Enabled=false`. This applies to LinkButton and any future button-like components.
+
+## Rationale
+
+WebForms audit HTML shows these are the exact patterns used by .NET Framework. Matching these patterns ensures CSS/JS compatibility after migration.
diff --git a/.ai-team/decisions/inbox/forge-m15-data-control-analysis.md b/.ai-team/decisions/inbox/forge-m15-data-control-analysis.md
new file mode 100644
index 000000000..7594040cc
--- /dev/null
+++ b/.ai-team/decisions/inbox/forge-m15-data-control-analysis.md
@@ -0,0 +1,52 @@
+# Decision: M15-10 Data Control Investigation Complete
+
+**Date:** 2026-02-28
+**Author:** Forge (Lead / Web Forms Reviewer)
+**Task:** M15-10 (GitHub #392)
+**Status:** For team review
+
+---
+
+## Context
+
+Performed line-by-line classification of all HTML divergences in DataList, GridView, ListView, and Repeater using post-fix normalized captures. This updates the M13 analysis in `planning-docs/DATA-CONTROL-ANALYSIS.md`.
+
+## Decisions
+
+### 1. Bug Reclassification
+
+3 of 5 M13 bugs are now FIXED (PR #377). 4 bugs remain:
+- **BUG-GV-4b (P1):** `UseAccessibleHeader` defaults to `false` in Blazor; WF defaults to `true`. One-line fix.
+- **BUG-GV-3 (P1):** `&amp;nbsp;` encoding in empty headers due to ternary expression type resolution. Fix with `@if`/`@else`.
+- **BUG-GV-4a (P2):** `<thead>` vs `<tbody>` for header rows — see D-11 proposal below.
+- **BUG-DL-2 (P3):** `itemtype` not rendered from generic type parameter.
+
+### 2. Proposed D-11: `<thead>` Header Section
+
+Blazor GridView always renders header rows in `<thead>`. WF GridView defaults to `<tbody>` for header rows (unless `HeaderRow.TableSection = TableRowSection.TableHeader` is explicitly set).
+
+**Options:**
+- (A) Register as D-11 intentional divergence — `<thead>` is semantically correct and preferred
+- (B) Fix to match WF by putting headers in `<tbody>` when `UseAccessibleHeader=false`
+
+**Forge's recommendation:** Option A. `<thead>` is the correct HTML5 semantic and no real-world migration will break because of this.
+
+### 3. Sample Alignment is Critical Path
+
+22 of 26 findings are sample parity. ListView and Repeater have ZERO component bugs — their entire diff is sample authoring differences. DataList and GridView have minor bugs but the vast majority of their diffs are also sample issues.
+
+**Impact:** Sample alignment would immediately reduce total diff lines from 294 to ~13, revealing only genuine structural issues.
+
+## Artifacts
+
+- Full analysis: `planning-docs/M15-DATA-CONTROL-ANALYSIS.md`
+- Prior analysis: `planning-docs/DATA-CONTROL-ANALYSIS.md`
+
+## Who Needs to Know
+
+- **Cyclops:** 3 bug fixes to implement (BUG-GV-4b, BUG-GV-3, BUG-DL-2)
+- **Jubilee:** Sample alignment for all 4 data controls is P1
+- **Colossus:** 2 normalizer fixes (empty `style=""` stripping, consistent `<div>` wrapper handling)
+- **Jeff:** D-11 (`<thead>` vs `<tbody>`) needs decision
+
+— Forge
diff --git a/.ai-team/decisions/inbox/forge-m15-html-fidelity-strategy.md b/.ai-team/decisions/inbox/forge-m15-html-fidelity-strategy.md
new file mode 100644
index 000000000..c7773897a
--- /dev/null
+++ b/.ai-team/decisions/inbox/forge-m15-html-fidelity-strategy.md
@@ -0,0 +1,364 @@
+# M15 HTML Fidelity Strategy — Post-PR #377 Assessment
+
+**Date:** 2026-02-28
+**Author:** Forge (Lead / Web Forms Reviewer)
+**Requested by:** Jeffrey T. Fritz
+**Context:** PR #377 merged to upstream/dev — contains M11–M14 deliverables including full HTML fidelity audit (132 comparisons), 14 bug fixes, post-fix re-run (131 divergences, 1 exact match), WebFormsPage component, data alignment, and NamingContainer.
+
+---
+
+## 1. Current State Assessment
+
+### Where We Stand
+
+After PR #377, we have the most complete picture of HTML fidelity this project has ever produced. The numbers tell a clear story:
+
+| Metric | Value | Assessment |
+|--------|-------|------------|
+| Total comparisons | 132 (128 unique + 4 HyperLink case dupes) | Good coverage of captured controls |
+| Exact matches | **1** (Literal-3) | Sobering — but misleading (see below) |
+| Verified structural improvements | 11 controls | The 14 bug fixes landed and verified |
+| Missing Blazor captures | 64 variants | **The #1 coverage gap** |
+| Sample parity false positives | ~22 entries | Noise masking real signal |
+| Genuine remaining structural bugs | ~5 controls | Fixable in M15 |
+| Data control investigations needed | 4 controls | Unknown severity |
+
+**The "1 exact match" number is misleading.** The vast majority of divergences are caused by **different sample data** between WebForms and Blazor, not by component bugs. If we align the sample data, I estimate **15–20 controls** would achieve exact or near-exact match immediately. The actual HTML structure is correct for most Tier 1 controls — DropDownList, HyperLink, HiddenField, Image (minus `longdesc`), ImageMap, Label, Literal, Panel, PlaceHolder, and AdRotator all render correct tag structure with only content differences.
+
+### Controls by Distance from Pixel-Perfect
+
+**Near-perfect (correct structure, needs sample data alignment only):** ~12 controls
+- AdRotator, DropDownList (6 variants), HiddenField, HyperLink (4 variants), Image (1 of 2), ImageMap, Label (3 variants), Literal (2 of 3), Panel (3 variants), PlaceHolder
+
+**Close (1–2 fixable attribute/structural issues):** ~6 controls
+- Button (fixed `<input>` — now needs sample parity only), BulletedList (still needs `<ol>` + `list-style-type`), CheckBox (remove `<span>` wrapper), Image (remove empty `longdesc`), LinkButton (add `href` + `class`), FileUpload (GUID attribute leak)
+
+**Moderate (structural work needed):** ~4 controls
+- Calendar (73% similarity — missing styles, `title`, navigation header differences), RadioButtonList (GUID IDs), GridView (33 line diff — mixed structural + sample), DataList (110 line diff — needs investigation)
+
+**Far (significant structural divergence):** ~3 controls
+- TreeView (deep structural differences in node rendering), ListView (182 line diff — template-based output), Repeater (64 line diff)
+
+**Unknown (missing Blazor captures):** ~20+ controls
+- All Login family (7 controls), all Validators (6 controls), Menu (9 variants), TextBox (7 variants), RadioButton (3), CheckBoxList (2), ImageButton (2), ListBox (2), SiteMapPath (2), MultiView, Table (3), DataPager, DetailsView, FormView
+
+---
+
+## 2. Remaining Divergence Analysis
+
+### Category A — Fixable Structural Bugs (5 controls, ~8–14 hours)
+
+These are genuine HTML structure differences where the Blazor component renders wrong elements or missing attributes. All fixable.
+
+| Control | Bug | Effort | Variants Fixed |
+|---------|-----|--------|----------------|
+| **BulletedList** | Still renders `<ul>` for numbered lists (should be `<ol>`); wrong `list-style-type` values (`disc`/`circle` vs `decimal`/`square`) | 1–2 hrs | 3 |
+| **LinkButton** | Missing `href` attribute; missing `CssClass` → `class` pass-through | 1–2 hrs | 3 |
+| **CheckBox** | Extra wrapping `<span>` around checkbox+label pair for TextAlign=Right | 1–2 hrs | 3 |
+| **Image** | Emits empty `longdesc=""` when `DescriptionUrl` is unset | 30 min | 2 |
+| **FileUpload** | Stray GUID fragment leaks as HTML attribute (CSS isolation scope artifact) | 1 hr | 1 |
+
+**Status of PR #377 fixes:** Button (`<input type="submit">`), BulletedList `<span>` removal, LinkButton `href`, Calendar border/`<tbody>`, CheckBox wrapper removal, Image `longdesc`, DataList border-collapse, GridView `rules`/`border`, and TreeView compression were all **fixed and verified** in the post-fix capture. However, BulletedList `<ol>` rendering and `list-style-type` mapping were NOT addressed. LinkButton `class` was NOT addressed. CheckBox may still have issues depending on capture state vs. code state.
+
+### Category B — Sample Parity Issues (NOT component bugs, ~22 entries)
+
+The single highest-value action for improving match rates. These controls render correct HTML structure but use completely different data/text/URLs between WebForms and Blazor samples:
+
+| Control | Nature of Difference |
+|---------|---------------------|
+| AdRotator | Bing vs Microsoft ad content, different images |
+| BulletedList | Apple/Banana/Cherry vs Item One/Two/Three |
+| Button | "Blue Button" w/ styling vs "Click me!" no styling |
+| CheckBox | "Accept Terms" vs "I agree to terms" |
+| DropDownList (×6) | Different option text/values throughout |
+| HiddenField | Different `value` attribute |
+| HyperLink (×4) | Bing vs GitHub, different text/URLs |
+| Image (×2) | Different src/alt |
+| ImageMap | Different coordinates/URLs |
+| Label (×3) | Different text/classes |
+| Literal (×2) | Different text content |
+| Panel (×3) | Different inner content |
+| PlaceHolder | Different placeholder text |
+
+**Fix approach:** Update Blazor sample pages to mirror exact WebForms content. This is a Jubilee task — mechanical but tedious. Estimated effort: 4–6 hours. Impact: potentially **20+ controls move to exact match** in one sprint.
+
+### Category C — Intentional/Unfixable Divergences (D-01 through D-10)
+
+These are permanent architectural differences. The normalizer already handles them. No action needed.
+
+| D-Code | What It Is | Status |
+|--------|-----------|--------|
+| D-01 | ID mangling (`ctl00_` prefixes) | ✅ Normalized — stripped before comparison |
+| D-02 | `__doPostBack` → `@onclick` | ✅ Normalized — replaced with placeholder |
+| D-03 | ViewState hidden fields | ✅ Normalized — stripped |
+| D-04 | WebResource.axd URLs | ✅ Normalized — stripped |
+| D-05 | Chart `<img>` vs `<canvas>` | ⛔ Excluded from audit entirely |
+| D-06 | Menu Table mode (Blazor = List only) | ✅ Documented — 4 variants permanently divergent |
+| D-07 | TreeView JS injection | ✅ Normalized — JS stripped |
+| D-08 | Calendar `__doPostBack` | ✅ Normalized — postback replaced |
+| D-09 | Login control auth infrastructure | ✅ Documented — compare visual shell only |
+| D-10 | Validator client-side scripts | ✅ Documented — compare `<span>` only |
+
+**New divergence candidates identified (need decision):**
+
+| Proposed | What It Is | Recommendation |
+|----------|-----------|----------------|
+| **D-11** | GUID-based IDs for CheckBox/RadioButton/RadioButtonList/FileUpload | **Fix, don't register as intentional.** GUIDs make HTML non-deterministic and untargetable by CSS/JS. Controls should use developer-provided `ID` parameter and append `_0`, `_1` per Web Forms convention. |
+| **D-12** | Boolean attribute format: `selected=""` (HTML5) vs `selected="selected"` (XHTML) | **Register as intentional.** Both are valid HTML. Blazor uses HTML5-style; Web Forms uses XHTML-style. Add normalizer rule to treat as equivalent. |
+| **D-13** | Calendar previous-month day padding (WF shows Jan 25–31; Blazor starts at Feb 1) | **Fix.** Web Forms Calendar pads the first week with previous month's days. Our Blazor Calendar should do the same — it's visible structural content. |
+| **D-14** | Calendar style property pass-through (WF applies inline styles for ForeColor, Font, etc.; Blazor doesn't) | **Fix progressively.** Calendar style application is incomplete — the `<table>` and cell-level styles from `TitleStyle`, `DayStyle`, `OtherMonthDayStyle`, `WeekendDayStyle`, `TodayDayStyle` etc. are not being applied. This is a significant fidelity gap for Calendar specifically. |
+
+### Category D — Normalizer Artifacts (3 items)
+
+| Issue | Impact | Fix |
+|-------|--------|-----|
+| HyperLink/Hyperlink case-sensitivity duplication | 4 phantom entries in diff report | Case-insensitive folder matching in diff script |
+| `selected=""` vs `selected="selected"` | False divergence in DropDownList | Add normalizer rule for boolean HTML attributes |
+| Empty `style=""` on some controls | Noise in diffs | Strip empty `style=""` attributes in normalizer |
+
+---
+
+## 3. Prioritized Next Steps — What M15 Should Focus On
+
+Ranked by **impact per unit of effort**:
+
+### 🔴 Tier 1 Priority: Sample Data Alignment (Impact: MASSIVE, Effort: MEDIUM)
+
+**This is the single highest-leverage action.** One sprint of sample alignment work could move us from 1 exact match to 15–20+ exact matches. Every other effort is wasted if the samples don't match — we can't tell what's a bug vs. what's different data.
+
+- Update all Blazor sample pages to use identical text, values, URLs, styles as WebForms samples
+- Covers: AdRotator, BulletedList, Button, CheckBox, DropDownList, HiddenField, HyperLink, Image, ImageMap, Label, Literal, Panel, PlaceHolder, LinkButton
+- Owner: Jubilee
+- Effort: 4–6 hours
+- Impact: ~22 false-positive divergences eliminated; true structural bugs surface cleanly
+
+### 🔴 Tier 2 Priority: Fix Remaining Structural Bugs (Impact: HIGH, Effort: LOW-MEDIUM)
+
+Ship the remaining P1–P3 bug fixes that were identified but not addressed in PR #377:
+
+| # | Fix | Effort | Impact |
+|---|-----|--------|--------|
+| 1 | BulletedList: `<ol>` for numbered + correct `list-style-type` mapping | 1–2 hrs | 3 variants → exact match |
+| 2 | LinkButton: Pass `CssClass` → `class` attribute | 1 hr | 3 variants improved |
+| 3 | Image: Only emit `longdesc` when non-empty | 30 min | 2 variants → exact match |
+| 4 | FileUpload: Remove stray GUID attribute leak | 1 hr | 1 variant → exact match |
+| 5 | CheckBox: Remove wrapping `<span>` (verify post-PR #377 state) | 1 hr | 3 variants improved |
+| 6 | RadioButtonList: Stable IDs (not GUIDs) | 1–2 hrs | 2 variants improved |
+
+Owner: Cyclops
+Total effort: 6–9 hours
+Impact: 14+ variants improved, 6+ potentially exact match
+
+### 🟡 Tier 3 Priority: Close Blazor Capture Gaps (Impact: HIGH, Effort: MEDIUM)
+
+64 variants have no Blazor capture. Prioritize by ROI:
+
+**Phase A — Add `data-audit-control` markers to EXISTING Blazor pages (2–3 hrs):**
+- TextBox (7 variants), RadioButton (3), CheckBoxList (2), ImageButton (2), ListBox (2), Button (variants 2–5), Literal (variant 3), SiteMapPath (2), Table (3), MultiView (1)
+- These controls already have Blazor sample pages — they just lack `data-audit-control` markers
+- Impact: ~25 more comparisons enabled
+
+**Phase B — Write new Blazor sample pages for missing controls (6–10 hrs):**
+- Menu (5 List-mode variants — 4 Table-mode are permanently divergent per D-06)
+- Login family (7 controls × 2 variants = 14 captures) — visual shell comparison
+- Validators (6 controls × 3–4 variants = ~23 captures) — `<span>` comparison only
+- DataPager, DetailsView, FormView
+- Impact: ~42 more comparisons
+
+Owner: Jubilee (samples), Colossus (captures)
+
+### 🟢 Tier 4 Priority: Normalizer Enhancements (Impact: MEDIUM, Effort: LOW)
+
+| Enhancement | Effort | Impact |
+|------------|--------|--------|
+| Case-insensitive folder matching (kills 4 HyperLink dupes) | 30 min | Cleaner reports |
+| Boolean attribute normalization (`selected=""` ↔ `selected="selected"`) | 30 min | DropDownList false positives eliminated |
+| Empty `style=""` stripping | 15 min | Noise reduction |
+| GUID ID normalization (strip or placeholder) | 1 hr | CheckBox/RadioButtonList/FileUpload noise reduced |
+
+Owner: Cyclops
+Total effort: 2–3 hours
+
+### 🟢 Tier 5 Priority: Data Control Deep Investigation (Impact: UNKNOWN, Effort: MEDIUM)
+
+DataList (110 lines), GridView (33 lines), ListView (182 lines), Repeater (64 lines) — all have both captures but show significant divergences. Need line-by-line classification.
+
+**My assessment before investigation:**
+- **GridView** (33 lines) — Likely mostly sample parity. The post-fix capture shows correct `<thead>`/`<tbody>` structure, `rules`/`border` attributes. Remaining diff is mostly different column names and content. Probably fixable with sample alignment.
+- **DataList** (110 lines) — The `<table>` structure is the right approach, but template rendering likely produces different cell content. Mix of sample parity and template handling differences.
+- **Repeater** (64 lines) — Repeater is unusual because it has no default chrome — it renders pure template output. Divergence is almost certainly 100% sample parity.
+- **ListView** (182 lines) — Largest divergence. ListView's template model is the most flexible in Web Forms and the hardest to match structurally. This control is likely to have genuine structural differences in how templates are composed.
+
+Owner: Forge (classification), Cyclops (fixes)
+Effort: 4–8 hours investigation, unknown fix effort
+
+### 🔵 Tier 6 Priority: Calendar Deep Fix (Impact: HIGH for one control, Effort: HIGH)
+
+Calendar is the most complex control and the closest to pixel-perfect among complex controls (73% similarity on best variant). Remaining gaps:
+
+1. **Previous-month day padding** — WF shows Jan 25–31 in the first row; Blazor starts at Feb 1
+2. **Style property pass-through** — `TitleStyle`, `DayStyle`, `OtherMonthDayStyle`, `WeekendDayStyle`, `TodayDayStyle`, `NextPrevStyle`, `SelectorStyle` inline styles not applied
+3. **`title` attribute on `<table>`** — WF emits `title="Calendar"`; Blazor doesn't
+4. **`id` attribute on `<table>`** — WF emits developer ID; Blazor doesn't (may be NamingContainer related)
+5. **`color` attribute on day links** — WF emits `style="color:#000000;"`; Blazor uses `cursor:pointer`
+6. **`background-color` on title row** — WF emits `background-color:#c0c0c0`; Blazor doesn't
+
+Owner: Cyclops
+Effort: 5–8 hours (touching multiple Razor files and style resolution logic)
+Impact: Could push Calendar from 73% to 90%+ similarity
+
+---
+
+## 4. Pixel-Perfect Realism
+
+Let me be blunt about what "pixel-perfect" means for this project.
+
+### Controls That CAN Achieve Exact Normalized Match
+
+With sample alignment + remaining bug fixes, these controls should achieve **100% normalized HTML match**:
+
+| Control | What's Needed | Confidence |
+|---------|--------------|------------|
+| Literal | ✅ Already exact (1 of 3 variants) | 100% |
+| HiddenField | Sample alignment only | 99% |
+| PlaceHolder | Sample alignment only | 99% |
+| Label | Sample alignment only | 98% |
+| Panel | Sample alignment only | 98% |
+| AdRotator | Sample alignment only | 95% |
+| Image | Remove `longdesc` + sample alignment | 95% |
+| HyperLink | Sample alignment only | 95% |
+| ImageMap | Sample alignment only | 95% |
+| DropDownList | Sample alignment + boolean attr normalizer | 90% |
+| BulletedList | `<ol>` fix + `list-style-type` + sample alignment | 90% |
+| LinkButton | `href` + `class` fix + sample alignment | 85% |
+| Button | Sample alignment only (already fixed to `<input>`) | 85% |
+
+**Realistic target: 13–15 exact matches after M15 (up from 1 today).**
+
+### Controls That Can Achieve Near-Match (>90% normalized similarity)
+
+| Control | Gap | Realistic Ceiling |
+|---------|-----|-------------------|
+| Calendar | Style pass-through, day padding, title | 90–95% with fixes |
+| CheckBox | `<span>` removal, stable IDs | 90–95% with fixes |
+| RadioButtonList | Stable IDs | 90% with ID fix |
+| FileUpload | GUID attribute removal | 95% |
+| GridView | Sample alignment + investigation | 85–95% TBD |
+
+### Controls That Will ALWAYS Have Structural Differences
+
+Be honest. These controls have fundamental architectural gaps that make exact HTML match impossible or impractical:
+
+| Control | Why | Permanent Gap |
+|---------|-----|---------------|
+| **Chart** | `<canvas>` vs `<img>` — completely different rendering technology | 100% different (D-05) |
+| **Menu (Table mode)** | Blazor only implements List mode; 4 Table-mode variants are permanently divergent | Partial (D-06) — List mode is comparable |
+| **TreeView** | Web Forms uses `<div><table><tr><td>` nested hierarchy per node; Blazor simplified. This is a deep structural choice unlikely to be changed without major refactor. | 30–50% — structural redesign needed for parity |
+| **Calendar** | Will never hit 100% due to `cursor:pointer` vs `color:#000000`, WF `title="Calendar"`, and style granularity differences | Ceiling ~95% with effort |
+| **Login controls** | Auth infrastructure divergence (D-09) — visual HTML can match but functional attributes won't | Visual shell match possible; functional attributes diverge |
+| **Validators** | Client-side script infrastructure (D-10) — `<span>` output matchable but evaluation attributes won't | `<span>` match possible; JS attributes diverge |
+
+### What "Pixel-Perfect" Realistically Means
+
+For this project, "pixel-perfect" should be defined as:
+
+> **After normalization (stripping intentional divergences D-01 through D-10+), the Blazor component's rendered HTML structure — tag names, nesting, CSS classes, and meaningful attributes — matches the Web Forms gold standard.**
+
+That definition excludes:
+- ID values (D-01 — always different)
+- Event mechanism attributes (D-02 — `__doPostBack` vs `@onclick`)
+- Infrastructure elements (D-03, D-04 — ViewState, WebResource.axd)
+- Content data (sample parity — responsibility of the migration developer, not the library)
+
+Under this definition, **I believe 20–25 controls can achieve "pixel-perfect" status** with the work outlined in M15. Another 10–15 can achieve "near-perfect" (>90% structural match). The remaining ~10–15 controls (Chart, TreeView, Menu Table-mode, Login family, Validators) will have documented intentional divergences that are architecturally unavoidable.
+
+---
+
+## 5. Recommended M15 Scope
+
+### Milestone 15: HTML Fidelity Closure
+
+**Branch:** `milestone15/html-fidelity-closure`
+**Duration estimate:** 2–3 weeks
+**Theme:** Close the gap between audit findings and actual HTML fidelity. Move from 1 exact match to 15+ exact matches.
+
+### Work Items
+
+| # | Work Item | Description | Owner | Size | Priority |
+|---|-----------|-------------|-------|------|----------|
+| M15-01 | **Sample data alignment** | Update ALL Blazor sample pages to mirror exact WebForms sample content (text, URLs, values, attributes, data items). Use WebForms captures in `audit-output/webforms/` as source of truth. Cover: AdRotator, BulletedList, Button, CheckBox, DropDownList, HiddenField, HyperLink, Image, ImageMap, Label, LinkButton, Literal, Panel, PlaceHolder. | Jubilee | L | 🔴 P0 |
+| M15-02 | **BulletedList `<ol>` fix** | Render `<ol>` when `BulletStyle` is Numbered/LowerAlpha/UpperAlpha/LowerRoman/UpperRoman. Fix `list-style-type` CSS mapping: Numbered→decimal, Circle→circle, Disc→disc, Square→square, LowerAlpha→lower-alpha, UpperAlpha→upper-alpha, LowerRoman→lower-roman, UpperRoman→upper-roman. | Cyclops | S | 🔴 P1 |
+| M15-03 | **LinkButton `class` pass-through** | Ensure `CssClass` parameter maps to `class` attribute on the rendered `<a>` element. | Cyclops | XS | 🔴 P1 |
+| M15-04 | **Image `longdesc` conditional** | Only render `longdesc` attribute when `DescriptionUrl` has a non-empty value. | Cyclops | XS | 🟡 P2 |
+| M15-05 | **FileUpload GUID attribute removal** | Investigate and remove stray CSS-isolation-scope GUID that leaks as an HTML attribute. | Cyclops | XS | 🟡 P2 |
+| M15-06 | **CheckBox `<span>` removal verification** | Verify the PR #377 fix is complete for all TextAlign variants. If `<span>` wrapper persists for any variant, fix it. | Cyclops | S | 🟡 P2 |
+| M15-07 | **Stable IDs for CheckBox/RadioButtonList** | Replace GUID-based IDs with developer-provided `ID` parameter. For RadioButtonList, append `_0`, `_1`, etc. per Web Forms convention. Fix `name` attribute to use control ID. | Cyclops | M | 🟡 P2 |
+| M15-08 | **Add `data-audit-control` markers** | Add markers to existing Blazor sample pages for: TextBox (7), RadioButton (3), CheckBoxList (2), ImageButton (2), ListBox (2), Button (variants 2–5), SiteMapPath (2), Table (3), MultiView (1). ~25 new comparisons. | Jubilee | M | 🟡 P2 |
+| M15-09 | **Normalizer enhancements** | (a) Case-insensitive folder matching, (b) Boolean attribute normalization, (c) Empty `style=""` stripping, (d) GUID ID normalization. | Cyclops | S | 🟢 P3 |
+| M15-10 | **Data control deep investigation** | Line-by-line classification of DataList (110 lines), GridView (33 lines), ListView (182 lines), Repeater (64 lines) divergences. Separate genuine bugs from sample parity and D-01/D-02. File issues for genuine bugs. | Forge | M | 🟢 P3 |
+| M15-11 | **Re-run full audit pipeline** | After all fixes and sample alignment, re-run the complete capture + normalize + diff pipeline. Target: ≥15 exact matches. Produce updated diff report. | Colossus | M | 🟢 P3 |
+| M15-12 | **Update divergence registry** | Add D-11 through D-14 as appropriate. Document any new divergences discovered during M15 investigation. Update `DIVERGENCE-REGISTRY.md`. | Forge | S | 🟢 P3 |
+
+### Agent Assignments
+
+| Agent | Work Items | Role |
+|-------|-----------|------|
+| **Forge** | M15-10, M15-12 | Data control investigation, divergence registry, overall review |
+| **Cyclops** | M15-02 through M15-07, M15-09 | Bug fixes, normalizer enhancements |
+| **Jubilee** | M15-01, M15-08 | Sample alignment, marker insertion |
+| **Colossus** | M15-11 | Full pipeline re-run |
+| **Rogue** | — | Test updates for any HTML fixes Cyclops makes |
+| **Beast** | — | Doc updates post-M15 if new exact matches warrant verification badges |
+
+### Dependencies
+
+```
+M15-01 ──→ M15-11  (sample alignment before re-run)
+M15-02 through M15-07 ──→ M15-11  (bug fixes before re-run)
+M15-09 ──→ M15-11  (normalizer fixes before re-run)
+M15-08 ──→ M15-11  (new markers before re-run)
+M15-10 ──→ M15-12  (investigation informs registry)
+M15-11 ──→ M15-12  (re-run results inform final registry)
+```
+
+### Exit Criteria
+
+1. ≥15 controls achieve exact normalized HTML match (up from 1)
+2. All Category A structural bugs (BulletedList, LinkButton, Image, FileUpload, CheckBox) are fixed
+3. Blazor sample data aligned to WebForms for all Tier 1 controls with existing captures
+4. ≥25 new Blazor comparisons enabled via `data-audit-control` markers
+5. Data control divergences (DataList, GridView, ListView, Repeater) classified with issues filed for genuine bugs
+6. Normalizer enhanced with boolean attribute, case-insensitive matching, and GUID ID handling
+7. Updated diff report showing improved match rates
+8. Divergence registry updated to D-14
+
+### Risk Assessment
+
+| Risk | Likelihood | Impact | Mitigation |
+|------|-----------|--------|-----------|
+| Sample alignment takes longer than estimated due to complex data binding differences | Medium | Low | Prioritize simple controls first; complex data controls can follow in M16 |
+| BulletedList `<ol>` fix breaks existing tests | Low | Medium | Run full test suite before PR; bUnit tests likely cover this |
+| GUID ID replacement breaks Blazor event binding | Medium | Medium | Test interactivity after ID stabilization; Blazor may use `@ref` not ID for event wiring |
+| Post-fix re-run reveals new regressions | Low | Low | Git bisect to isolate; targeted fix |
+| Calendar style pass-through is larger than estimated | High | Medium | Defer Calendar deep fix to M16 if scope grows; capture current similarity as baseline |
+
+---
+
+## 6. Beyond M15 — The Road to Maximum Fidelity
+
+If M15 hits its targets (15+ exact matches, all Tier 1 structural bugs fixed, sample parity for simple controls), the roadmap for M16+ looks like this:
+
+| Milestone | Focus | Expected Outcome |
+|-----------|-------|-----------------|
+| **M16** | Calendar deep fix (styles, day padding, title), TreeView structural alignment investigation, Menu List-mode Blazor captures | Calendar → 90%+; TreeView assessment; Menu assessed |
+| **M17** | Login family visual shell captures + comparison, Validator `<span>` comparison | Coverage expanded to 40+ controls compared |
+| **M18** | Data control sample alignment + structural fixes (GridView, DataList, ListView, Repeater) | Data controls assessed and fixed |
+| **M19** | CI integration — automated HTML regression in build pipeline | Prevents regression going forward |
+
+The honest bottom line: **This library will never achieve 100% exact HTML match for all controls.** Chart, TreeView, Menu Table-mode, and the event mechanism infrastructure are permanently divergent by design. But for the ~35 controls that represent the everyday migration path (Button, TextBox, Label, DropDownList, GridView, etc.), we should be able to reach 90%+ structural match — and that's what developers migrating from Web Forms actually need.
+
+---
+
+**Decision:** M15 scope as defined above is recommended. Forge endorses this plan.
+
+— Forge, Lead / Web Forms Reviewer
diff --git a/planning-docs/M15-DATA-CONTROL-ANALYSIS.md b/planning-docs/M15-DATA-CONTROL-ANALYSIS.md
new file mode 100644
index 000000000..b2180f358
--- /dev/null
+++ b/planning-docs/M15-DATA-CONTROL-ANALYSIS.md
@@ -0,0 +1,239 @@
+# M15-10: Data Control Deep Investigation — Line-by-Line Classification
+
+**Author:** Forge (Lead / Web Forms Reviewer)
+**Date:** 2026-02-28
+**Milestone:** M15 (GitHub #392)
+**Status:** Complete
+**Baseline:** Post-fix capture (after PR #377 merged 14 bug fixes)
+**Prior analysis:** `planning-docs/DATA-CONTROL-ANALYSIS.md` (M13)
+
+---
+
+## Executive Summary
+
+This is a line-by-line re-classification of all divergences in the 4 data controls using the **post-fix normalized** HTML captures. The prior M13 analysis identified 5 genuine bugs; 2 of those have been **fixed** in PR #377. This M15 re-assessment reclassifies every diff line against the current codebase.
+
+**Headline finding:** Sample parity remains the overwhelming blocker. Of 294 diff lines across all 4 controls, only 4 are genuine component bugs. The rest are sample authoring differences.
+
+**Updated Summary Table:**
+
+| Control | Diff Lines | Genuine Bugs | Sample Parity | Normalizer | Intentional (D-code) | Fixed Since M13 |
+|---------|-----------|-------------|---------------|------------|---------------------|----------------|
+| DataList | 106 | 1 | 8 | 0 | 0 | 1 (BUG-DL-3) |
+| GridView | 20 | 3 | 4 | 2 | 1 (D-01) | 2 (BUG-GV-1, BUG-GV-2) |
+| ListView | 106 | 0 | 5 (+1 WF sample bug) | 0 | 0 | 0 |
+| Repeater | 62 | 0 | 5 | 0 | 0 | 0 |
+| **Total** | **294** | **4** | **22 (+1)** | **2** | **1** | **3** |
+
+---
+
+## DataList — 106 diff lines
+
+### Summary
+- Genuine bugs: 1
+- Sample parity: 8
+- Intentional: 0
+- Normalizer: 0
+- Fixed since M13: 1
+
+### Line-by-Line Classification
+
+| Line(s) | WF Content | BZ Content | Category | Description |
+|---------|-----------|-----------|----------|-------------|
+| WF:1 `id="simpleDataList"` | `id="simpleDataList"` | (absent) | Sample parity | Blazor sample doesn't set an ID. Component supports it via base class. |
+| WF:1 `itemtype="SharedSampleObjects.Models.Widget"` | `itemtype="..."` | (absent) | Genuine bug (BUG-DL-2) | WF renders the `ItemType` value as an HTML `itemtype` microdata attribute on the `<table>`. Blazor's `GetItemTypeAttribute()` only checks `AdditionalAttributes`, not the generic `ItemType` type parameter. The component should render `typeof(ItemType).FullName` when the generic parameter is specified. |
+| WF:1 `tabindex="1"` | `tabindex="1"` | (absent) | Sample parity | Blazor sample doesn't set `TabIndex`. Component supports it (DataList.razor line 28). |
+| WF:1 `title="This is my tooltip"` | `title="..."` | (absent) | Sample parity | Blazor sample doesn't set `ToolTip`. Component supports it (DataList.razor line 29). |
+| WF:2-3 | `<caption align="Top">This is my caption</caption>` | (absent) | Sample parity | Blazor sample doesn't set `Caption` or `CaptionAlign`. Component supports both (DataList.razor lines 33-36). |
+| WF:4-7 | `<th class="myClass" scope="col" style="font-family:arial...; font-size:x-large; font-weight:bold; font-style:italic; text-decoration:underline overline line-through;">My Widget List</th>` | `<td>Simple Widgets</td>` | Sample parity | WF sample sets `UseAccessibleHeader=true` (→ `<th>` + `scope`), `HeaderStyle.CssClass="myClass"`, and extensive font styling. Blazor sample uses none of these. Different header text ("My Widget List" vs "Simple Widgets"). |
+| WF:8-103 (item rows) | Each item: `<td style="background-color:#ffff00; white-space:nowrap;">Name<br/>$Price</td>` alternating with `background-color:#f5deb3` | Each item: `<td style="background-color:#f5deb3;">Name - $Price</td>` (uniform) | Sample parity | WF template uses `<br/>` between name and price; Blazor uses ` - `. WF alternates Yellow/Wheat; Blazor uses Wheat only. WF has `white-space:nowrap` from `Wrap="false"`; Blazor doesn't set Wrap. |
+| WF:15,23,31,39,47,55,63,71,79,87,95 | `<td style="color:#ffefd5; background-color:#000000;">Hi! I'm a separator!...</td>` (11 separator rows) | (absent) | Sample parity | Blazor sample omits `SeparatorTemplate` entirely. Component supports it (DataList.razor line 62). |
+| WF:103/BZ | `<td>End of Line</td>` | `<td>End of Line</td>` | ✅ Match | Footer template renders identically. |
+| WF:1 (no `style=`) | (no border-collapse) | (no border-collapse) | ✅ FIXED (was BUG-DL-3) | PR #377 fixed conditional `border-collapse` in `GetTableStyle()`. Now correctly omits it when `GridLines=None` (default). Verified in current normalized output. |
+
+### Recommendations
+- **BUG-DL-2 (itemtype):** Low priority (P3). Fix `GetItemTypeAttribute()` to also return `typeof(ItemType).FullName` when no explicit `itemtype` is in AdditionalAttributes. Rarely impacts real migrations — `itemtype` is a microdata attribute.
+- **Sample alignment:** The Blazor DataList sample needs: `ToolTip`, `TabIndex`, `Caption`, `CaptionAlign`, `CellPadding`, `CellSpacing`, `HeaderStyle` with fonts, `UseAccessibleHeader`, `SeparatorTemplate` with `SeparatorStyle`, `AlternatingItemStyle`, `ItemStyle.Wrap="false"`, and matching template markup (`Name<br/>$Price` instead of `Name - $Price`).
+- **Achievable match:** Near-exact after sample alignment + BUG-DL-2 fix. Estimated: **>95% match**.
+
+---
+
+## GridView — 20 diff lines
+
+### Summary
+- Genuine bugs: 3
+- Sample parity: 4
+- Intentional: 1 (D-01)
+- Normalizer: 2
+- Fixed since M13: 2
+
+### Line-by-Line Classification
+
+| Line(s) | WF Content | BZ Content | Category | Description |
+|---------|-----------|-----------|----------|-------------|
+| WF:1,19 `<div>...</div>` | `<div>` wrapper around `<table>` | (absent) | Normalizer artifact | The `<div data-audit-control="GridView">` wrapper is retained in WF normalized output but stripped in Blazor. The normalizer should handle both consistently. Not a component issue. |
+| WF:2 `id="CustomersGridView"` | `id="CustomersGridView"` | (absent) | D-01 + Sample parity | ID mangling (D-01 intentional divergence). Additionally, Blazor sample doesn't set any ID attribute. |
+| WF:2 (no `class`) vs BZ `class="table table-striped"` | (no class) | `class="table table-striped"` | Sample parity | Blazor sample adds `CssClass="table table-striped"` which WF sample doesn't have. |
+| WF:2 / BZ `style="border-collapse:collapse;"` | `style="border-collapse:collapse;"` | `style="border-collapse:collapse;"` | ✅ FIXED (was BUG-GV-2) | Both now render `border-collapse:collapse;`. Fixed in PR #377. |
+| WF:2 (no `rules`/`border`) vs BZ `rules="all" border="1"` | (absent in normalized) | `rules="all" border="1"` | ✅ FIXED (was BUG-GV-1) | Wait — reversed. WF raw has `cellspacing="0" rules="all" border="1"`. Normalized WF also has these. Normalized Blazor also has `rules` and `border` in the style. The default `GridLines.Both` now correctly renders `rules="all" border="1"`. Fixed in PR #377. |
+| WF:3-4 `<tbody><tr><th scope="col">` | Header row in `<tbody>` with `<th scope="col">` | Header row in `<thead>` with `<th>` (no scope) | Genuine bug (BUG-GV-4) | **Two issues:** (1) WF puts header row in `<tbody>` by default; Blazor always uses `<thead>`. While `<thead>` is semantically better, it doesn't match WF output. (2) WF defaults `UseAccessibleHeader=true` (since .NET 3.5 SP1), rendering `scope="col"` on `<th>` elements. Blazor defaults `UseAccessibleHeader` to `false` (GridView.razor.cs line 230), omitting `scope`. Default value mismatch. |
+| WF:4 `CustomerID` | HeaderText `CustomerID` | HeaderText `ID` | Sample parity | Different `HeaderText` values in the samples. |
+| WF:5 `&nbsp;` vs BZ `&amp;nbsp;` | `&nbsp;` (non-breaking space) in empty header cells | `&amp;nbsp;` (HTML-encoded literal) | Genuine bug (BUG-GV-3) | The ternary expression on GridView.razor line 38 — `@(string.IsNullOrEmpty(column.HeaderText) ? (MarkupString)"&nbsp;" : column.HeaderText)` — fails because the ternary resolves to `object`/`string` type, causing Blazor to HTML-encode the `MarkupString`. Fix: use `@if`/`@else` instead of ternary. |
+| WF:8,12,16 `<a href="...">Search for ...</a>` vs BZ `<input style="" type="submit" />` | HyperLinkField with Bing search URLs | ButtonField rendering as `<input type="submit">` | Sample parity | WF sample uses `HyperLinkField`; Blazor sample uses `ButtonField`. Different column types. |
+| BZ `style=""` on `<input>` | (no empty style) | `style=""` | Normalizer artifact | Empty `style` attribute on ButtonField's `<input>`. Normalizer should strip empty `style=""` attributes. |
+
+### Recommendations
+1. **BUG-GV-4a (`<thead>` vs `<tbody>`):** P2. Consider making header section configurable — add `HeaderRow.TableSection` support or match WF default by rendering header in `<tbody>` when `UseAccessibleHeader=false`. However, `<thead>` is semantically correct; consider registering as D-11 intentional divergence instead.
+2. **BUG-GV-4b (`UseAccessibleHeader` default):** P1. Change default from `false` to `true` in GridView.razor.cs line 230 to match WF's .NET 3.5 SP1+ default. One-line fix: `public bool UseAccessibleHeader { get; set; } = true;`
+3. **BUG-GV-3 (`&amp;nbsp;` encoding):** P1. Replace the ternary on line 38 of GridView.razor with explicit `@if`/`@else` to preserve `MarkupString` rendering. Small, surgical fix.
+4. **Normalizer:** Strip empty `style=""` attributes. Strip `<div>` wrapper from data-audit-control consistently.
+5. **Sample alignment:** Change Blazor HeaderText `"ID"` → `"CustomerID"`. Replace `ButtonField` with `HyperLinkField`. Remove `CssClass="table table-striped"`.
+6. **Achievable match:** Near-exact after sample alignment + bug fixes. Estimated: **>90% match** (remaining gap: `<thead>` vs `<tbody>` structural choice).
+
+---
+
+## ListView — 106 diff lines
+
+### Summary
+- Genuine bugs: 0
+- Sample parity: 5
+- WF sample bug: 1
+- Intentional: 0
+- Normalizer: 0
+
+### Line-by-Line Classification
+
+| Line(s) | WF Content | BZ Content | Category | Description |
+|---------|-----------|-----------|----------|-------------|
+| WF:1 `<table>` vs BZ `<table class="table">` | No class | `class="table"` | Sample parity | Blazor sample adds Bootstrap `class="table"` on the outer `<table>`. WF sample has a bare `<table>` in LayoutTemplate. |
+| WF:18,28,36,44,52,60,68,76,84,92,100 (separator rows) | `<tr><td colspan="4" style="border-bottom:1px solid #000000;">&nbsp;</td></tr>` (11 separator rows between items) | (absent) | Sample parity | Blazor sample has `ItemSeparatorTemplate` **commented out** with `@*...*@` (Index.razor lines 43-46). Component supports it; this is a sample authoring decision. |
+| WF:21,39,57,75,93,111 (AlternatingItem Id col) | `$2.00`, `$4.00`, `$6.00`, `$8.00`, `$10.00`, `$12.00` | `2`, `4`, `6`, `8`, `10`, `12` | WF sample bug | WF sample uses `DataBinder.Eval(Container.DataItem, "Id", "{0:C}")` which formats integer `Id` as currency. This is a bug in the WF sample — `Id` is an integer, not a price. Blazor sample correctly renders `@Item.Id`. |
+| WF:5-116 / BZ (common widget data) | Widget names, prices, dates match | Widget names, prices match | ✅ Match | Both samples use the same `Widget.SimpleWidgetList` data source with identical names and prices. |
+| Date values | `2/26/2026` | `2/26/2026` | ✅ Match | Dates now match (same capture date in post-fix run). |
+
+### Structural Component Assessment
+
+The ListView component introduces **no structural divergences**. The Blazor `ListView.razor` correctly implements:
+- `ItemTemplate` / `AlternatingItemTemplate` with proper alternation
+- `ItemSeparatorTemplate` (functional, just commented out in sample)
+- `LayoutTemplate` as outer container
+- `EmptyDataTemplate` for empty state
+- `GroupTemplate` with `GroupItemCount` for grouped layouts
+
+**No genuine bugs found in the ListView component.**
+
+### Recommendations
+- **Fix WF sample bug:** Change `DataBinder.Eval(Container.DataItem, "Id", "{0:C}")` to `<%# Item.Id %>` in the WF AlternatingItemTemplate.
+- **Sample alignment:** Uncomment Blazor `ItemSeparatorTemplate`. Remove `class="table"` from outer `<table>`. Optionally move `<table>` structure into a `LayoutTemplate` inside the ListView (matching WF pattern).
+- **Achievable match:** **Exact match** after sample alignment. Zero component bugs.
+
+---
+
+## Repeater — 62 diff lines
+
+### Summary
+- Genuine bugs: 0
+- Sample parity: 5
+- Intentional: 0
+- Normalizer: 0
+
+### Line-by-Line Classification
+
+| Line(s) | WF Content | BZ Content | Category | Description |
+|---------|-----------|-----------|----------|-------------|
+| WF:1 | `This is a list of widgets` (HeaderTemplate plain text) | (absent — no HeaderTemplate) | Sample parity | WF has HeaderTemplate; Blazor omits it. Component supports HeaderTemplate. |
+| WF:2,4,6,8,10,12,14,16,18,20,22,24 | `<li>Widget Name</li>` (simple list items) | `<tr><td>Id</td><td>Name</td><td>$Price</td><td>Date</td></tr>` (table rows, 4 columns) | Sample parity | Completely different template structures. WF: simple `<li>` per item with name only. Blazor: `<tr>` with 4 data columns (Id, Name, Price, LastUpdate). |
+| WF:3,5,7,9,11,13,15,17,19,21,23 | `<hr/>` (SeparatorTemplate) | `<tr><td colspan="4"><hr/></td></tr>` (table-wrapped separator) | Sample parity | Both use `<hr/>` but in different structural contexts. WF has bare `<hr/>` between `<li>` items. Blazor wraps `<hr/>` in a table cell. Both are correct for their template structure. |
+| WF:25 | `This is the footer of the control` (FooterTemplate plain text) | (absent — no FooterTemplate) | Sample parity | WF has FooterTemplate; Blazor omits it. Component supports FooterTemplate. |
+| BZ (entire output) | — | Wrapped in `<table>` element | Sample parity | Blazor sample page adds `<table>` around the Repeater component (Index.razor line 14). This is page-level markup, not component behavior. WF sample has no wrapping element. |
+
+### Structural Component Assessment
+
+The Repeater is the simplest data control — it iterates items with templates and nothing else. Both the WF and Blazor components render `HeaderTemplate → (ItemTemplate|AlternatingItemTemplate with SeparatorTemplate) → FooterTemplate` identically. The 62-line diff is **100% attributable to different sample page authoring**.
+
+The WF sample's use of bare `<li>` elements without a parent `<ul>` or `<ol>` is technically invalid HTML, but that's a WF sample issue, not a control issue.
+
+**No genuine bugs found in the Repeater component.**
+
+### Recommendations
+- **Sample alignment:** Rewrite the Blazor Repeater sample to match the WF sample: use `<li>Widget Name</li>` items, bare `<hr/>` separator, header/footer plain text, and no wrapping `<table>`. Alternatively, update both samples to use the same structure.
+- **Achievable match:** **Exact match** after sample alignment. Zero component bugs.
+
+---
+
+## Cross-Cutting Findings
+
+### 1. Bugs Fixed Since M13
+
+Three of the 5 bugs identified in the M13 analysis have been **fixed** in PR #377:
+
+| Bug ID | Control | Fix | Status |
+|--------|---------|-----|--------|
+| BUG-DL-3 | DataList | Conditional `border-collapse` in `GetTableStyle()` based on `GridLines != None` | ✅ Fixed |
+| BUG-GV-1 | GridView | Default `GridLines.Both` → `rules="all" border="1"` | ✅ Fixed |
+| BUG-GV-2 | GridView | `border-collapse:collapse;` now rendered on table | ✅ Fixed |
+
+### 2. Remaining Genuine Bugs: 4
+
+| Bug ID | Control | Description | Severity | Fix Effort |
+|--------|---------|-------------|----------|-----------|
+| BUG-DL-2 | DataList | `itemtype` attribute not rendered from generic `ItemType` parameter | P3 (Low) | Small — modify `GetItemTypeAttribute()` |
+| BUG-GV-3 | GridView | `&amp;nbsp;` instead of `&nbsp;` in empty header cells (ternary expression type issue) | P1 (Medium) | Small — replace ternary with `@if`/`@else` on line 38 |
+| BUG-GV-4a | GridView | Header row in `<thead>` instead of WF's `<tbody>` | P2 (Low) | Medium — structural change or register as D-11 |
+| BUG-GV-4b | GridView | `UseAccessibleHeader` defaults to `false`, WF defaults to `true` | P1 (Medium) | Trivial — one-line default value change |
+
+### 3. Normalizer Gaps: 2
+
+| Issue | Description | Fix |
+|-------|-------------|-----|
+| `<div>` wrapper inconsistency | Audit marker `<div>` retained in WF output but stripped in Blazor | Normalize both sides consistently |
+| Empty `style=""` attributes | ButtonField renders `style=""` on `<input>` elements | Strip empty `style` attributes during normalization |
+
+### 4. New Divergence Candidate
+
+| Code | Description | Recommendation |
+|------|-------------|----------------|
+| D-11 (proposed) | Blazor uses `<thead>` for header rows; WF uses `<tbody>` by default | Register as intentional if team agrees `<thead>` is the better semantic choice. If not, fix GridView to match WF. |
+
+### 5. Sample Parity Remains #1 Blocker
+
+22 of 26 classified findings are sample parity issues. The Blazor samples were authored independently and exercise different features, data formats, and template structures than the WF samples. Until samples are aligned, the diff output is not meaningful for component quality assessment.
+
+**Estimated impact of sample alignment alone:**
+- DataList: 106 → ~5 diff lines (just BUG-DL-2)
+- GridView: 20 → ~8 diff lines (just remaining bugs + structural `<thead>` choice)
+- ListView: 106 → 0 diff lines (exact match)
+- Repeater: 62 → 0 diff lines (exact match)
+
+---
+
+## Action Items (Updated from M13)
+
+| # | Action | Owner | Priority | Status |
+|---|--------|-------|----------|--------|
+| 1 | ~~Fix BUG-DL-3: Conditional border-collapse~~ | ~~Cyclops~~ | ~~P1~~ | ✅ Done (PR #377) |
+| 2 | ~~Fix BUG-GV-1: Default GridLines=Both~~ | ~~Cyclops~~ | ~~P1~~ | ✅ Done (PR #377) |
+| 3 | ~~Fix BUG-GV-2: Default border-collapse~~ | ~~Cyclops~~ | ~~P1~~ | ✅ Done (PR #377) |
+| 4 | Fix BUG-GV-4b: Change `UseAccessibleHeader` default to `true` | Cyclops | P1 | New |
+| 5 | Fix BUG-GV-3: Replace ternary with `@if`/`@else` for `&nbsp;` | Cyclops | P1 | Revised |
+| 6 | Fix BUG-DL-2: Render `itemtype` from generic type parameter | Cyclops | P3 | Carried |
+| 7 | Decision: Register `<thead>` as D-11 or fix to match WF `<tbody>` | Forge | P2 | New |
+| 8 | Normalizer: Strip empty `style=""` attributes | Colossus | P2 | New |
+| 9 | Normalizer: Consistent `<div>` wrapper stripping | Colossus | P2 | New |
+| 10 | Sample alignment: DataList, GridView, ListView, Repeater | Jubilee | P1 | Carried |
+| 11 | Fix WF ListView sample: `DataBinder.Eval(..."Id", "{0:C}")` bug | Jubilee | P2 | Carried |
+
+---
+
+## Achievable Match Levels
+
+| Control | Current Match | After Sample Alignment | After All Fixes | Permanently Divergent? |
+|---------|-------------|----------------------|-----------------|----------------------|
+| DataList | ~5% | ~95% | ~98% | No (minor `itemtype` gap only) |
+| GridView | ~30% | ~70% | ~95% | Possibly (`<thead>` vs `<tbody>` if kept) |
+| ListView | ~40% | **100%** | **100%** | No |
+| Repeater | ~0% | **100%** | **100%** | No |
+
+---
+
+— Forge
diff --git a/samples/AfterBlazorServerSide/Ads.xml b/samples/AfterBlazorServerSide/Ads.xml
index 8c760ca01..f10b11155 100644
--- a/samples/AfterBlazorServerSide/Ads.xml
+++ b/samples/AfterBlazorServerSide/Ads.xml
@@ -1,20 +1,16 @@
 <Advertisements>  
   <Ad>  
     <ImageUrl>/img/CSharp.png</ImageUrl>  
-    <Height>343</Height>  
-    <Width>397</Width>  
-    <NavigateUrl>http://www.microsoft.com</NavigateUrl>  
+    <NavigateUrl>https://learn.microsoft.com/dotnet/csharp/</NavigateUrl>  
     <AlternateText>CSharp</AlternateText>  
-    <Impressions>90</Impressions>  
-    <Keyword>c#</Keyword>  
+    <Impressions>50</Impressions>  
+    <Keyword>language</Keyword>  
   </Ad>  
   <Ad>  
     <ImageUrl>/img/VB.png</ImageUrl>
-		<Height>343</Height>
-		<Width>397</Width>
-		<NavigateUrl>http://www.microsoft.com</NavigateUrl>  
+    <NavigateUrl>https://learn.microsoft.com/dotnet/visual-basic/</NavigateUrl>  
     <AlternateText>Visual Basic</AlternateText>  
-    <Impressions>80</Impressions>  
-    <Keyword>vb</Keyword>  
+    <Impressions>50</Impressions>  
+    <Keyword>language</Keyword>  
   </Ad>  
-</Advertisements>  
+</Advertisements>
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/BulletedList/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/BulletedList/Index.razor
index 80fba30cd..f41490261 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/BulletedList/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/BulletedList/Index.razor
@@ -5,33 +5,34 @@
 
 <h3>Basic BulletedList with Static Items (Text Mode)</h3>
 <div data-audit-control="BulletedList-1">
-    <BulletedList TItem="object" StaticItems="basicItems" />
+    <BulletedList TItem="object" StaticItems="discItems" BulletStyle="BulletStyle.Disc" />
 </div>
-<pre><code>&lt;BulletedList TItem="object" StaticItems="basicItems" /&gt;
+<pre><code>&lt;BulletedList TItem="object" StaticItems="discItems" BulletStyle="BulletStyle.Disc" /&gt;
 
 @@code {
-    private ListItemCollection basicItems = new() {
-        new ListItem("First item", "1"),
-        new ListItem("Second item", "2"),
-        new ListItem("Third item", "3")
+    private ListItemCollection discItems = new() {
+        new ListItem("Apple", "1"),
+        new ListItem("Banana", "2"),
+        new ListItem("Cherry", "3"),
+        new ListItem("Date", "4")
     };
 }</code></pre>
 
 <hr />
 
-<h3>Bullet Style: Disc (Default for unordered)</h3>
+<h3>Bullet Style: Numbered</h3>
 <div data-audit-control="BulletedList-2">
-    <BulletedList TItem="object" StaticItems="bulletItems" BulletStyle="BulletStyle.Disc" />
+    <BulletedList TItem="object" StaticItems="numberedItems" BulletStyle="BulletStyle.Numbered" />
 </div>
-<pre><code>&lt;BulletedList TItem="object" StaticItems="bulletItems" BulletStyle="BulletStyle.Disc" /&gt;</code></pre>
+<pre><code>&lt;BulletedList TItem="object" StaticItems="numberedItems" BulletStyle="BulletStyle.Numbered" /&gt;</code></pre>
 
 <hr />
 
-<h3>Bullet Style: Circle</h3>
+<h3>Bullet Style: Square with HyperLinks</h3>
 <div data-audit-control="BulletedList-3">
-    <BulletedList TItem="object" StaticItems="bulletItems" BulletStyle="BulletStyle.Circle" />
+    <BulletedList TItem="object" StaticItems="squareLinkItems" BulletStyle="BulletStyle.Square" DisplayMode="BulletedListDisplayMode.HyperLink" />
 </div>
-<pre><code>&lt;BulletedList TItem="object" StaticItems="bulletItems" BulletStyle="BulletStyle.Circle" /&gt;</code></pre>
+<pre><code>&lt;BulletedList TItem="object" StaticItems="squareLinkItems" BulletStyle="BulletStyle.Square" DisplayMode="BulletedListDisplayMode.HyperLink" /&gt;</code></pre>
 
 <hr />
 
@@ -186,11 +187,25 @@
 @code {
 	private string clickMessage = "Click an item above to see the result.";
 
-	private ListItemCollection basicItems = new()
+	private ListItemCollection discItems = new()
+	{
+		new ListItem("Apple", "1"),
+		new ListItem("Banana", "2"),
+		new ListItem("Cherry", "3"),
+		new ListItem("Date", "4")
+	};
+
+	private ListItemCollection numberedItems = new()
+	{
+		new ListItem("First", "1"),
+		new ListItem("Second", "2"),
+		new ListItem("Third", "3")
+	};
+
+	private ListItemCollection squareLinkItems = new()
 	{
-		new ListItem("First item", "1"),
-		new ListItem("Second item", "2"),
-		new ListItem("Third item", "3")
+		new ListItem("Example Site", "https://example.com"),
+		new ListItem("Example Org", "https://example.org")
 	};
 
 	private ListItemCollection bulletItems = new()
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Button/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Button/Index.razor
index 30cb479d4..494fb9f35 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Button/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Button/Index.razor
@@ -5,8 +5,8 @@
 <Nav></Nav>
 
 <div data-audit-control="Button-1">
-    <Button CommandName="Foo" CommandArgument="bar" OnCommand="OnCommand" OnClick="OnClick" Text="Click me!"
-				AccessKey="b" ToolTip="Click to submit" />
+    <Button OnClick="OnClick" Text="Blue Button"
+				BackColor="WebColor.Blue" ForeColor="WebColor.White" />
 </div>
 
 <p><em>Tip:</em> This button has <code>AccessKey="b"</code> (press <kbd>Alt+B</kbd> to focus) and <code>ToolTip="Click to submit"</code> (hover to see).</p>
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/ChangePassword/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/ChangePassword/Index.razor
index 4751332fc..fb8e42334 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/ChangePassword/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/ChangePassword/Index.razor
@@ -11,10 +11,12 @@
 </p>
 
 <h3>Default ChangePassword</h3>
+<div data-audit-control="ChangePassword-1">
 <ChangePassword ID="ChangePassword1"
 	OnChangingPassword="HandleChangingPassword"
 	OnChangedPassword="HandleChangedPassword"
 	OnCancelButtonClick="HandleCancel" />
+</div>
 
 <p style="margin-top: 10px; font-weight: bold;">@statusMessage</p>
 
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Chart/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Chart/Index.razor
index 02fd9e7ae..56450a57b 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Chart/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Chart/Index.razor
@@ -8,6 +8,7 @@
 
 <p>The Chart component renders data visualizations using Chart.js. The default chart type is <strong>Column</strong>, which displays vertical bars for comparing values across categories.</p>
 
+<div data-audit-control="Chart">
 <Chart ChartWidth="600px" ChartHeight="400px">
 	<ChartTitle Text="Monthly Sales — 2025" />
 	<ChartLegend Name="Default" />
@@ -19,6 +20,7 @@
 		ChartArea="MainArea"
 		Points="@SalesPoints" />
 </Chart>
+</div>
 
 @code {
 
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/CheckBox/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/CheckBox/Index.razor
index 90e89702c..d351f6cb8 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/CheckBox/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/CheckBox/Index.razor
@@ -8,18 +8,18 @@
 
 <h3>Basic CheckBox</h3>
 <div data-audit-control="CheckBox-1">
-    <CheckBox Text="I agree to terms" @bind-Checked="agreed" />
+    <CheckBox Text="Accept Terms" @bind-Checked="agreed" />
 </div>
 <p>Agreed: <strong>@agreed</strong></p>
 
 <h3>Pre-checked CheckBox</h3>
 <div data-audit-control="CheckBox-2">
-    <CheckBox Text="Already checked" Checked="true" />
+    <CheckBox Text="Subscribe" Checked="true" />
 </div>
 
-<h3>Text Alignment</h3>
+<h3>With AutoPostBack</h3>
 <div data-audit-control="CheckBox-3">
-    <CheckBox Text="Label on right (default)" />
+    <CheckBox Text="Enable Feature" AutoPostBack="true" />
 </div>
 <br />
 <CheckBox Text="Label on left" TextAlign="TextAlign.Left" />
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/CreateUserWizard/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/CreateUserWizard/Index.razor
index 88eaf02d8..bf4d0f7c0 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/CreateUserWizard/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/CreateUserWizard/Index.razor
@@ -11,10 +11,12 @@
 </p>
 
 <h3>Default CreateUserWizard</h3>
+<div data-audit-control="CreateUserWizard-1">
 <CreateUserWizard ID="CreateUserWizard1"
 	DisplaySideBar="false"
 	OnCreatingUser="HandleCreatingUser"
 	OnCreatedUser="HandleCreatedUser" />
+</div>
 
 <p style="margin-top: 10px; font-weight: bold;">@statusMessage</p>
 
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/DataPager/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/DataPager/Index.razor
new file mode 100644
index 000000000..6cf298c09
--- /dev/null
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/DataPager/Index.razor
@@ -0,0 +1,87 @@
+@page "/ControlSamples/DataPager"
+@using BlazorWebFormsComponents.Enums
+
+<h2>DataPager Component</h2>
+
+<Nav />
+
+<p>
+	The <code>DataPager</code> component provides paging functionality for data-bound controls.
+	It supports numeric page buttons and next/previous navigation.
+</p>
+
+<h3>DataPager with Numeric Buttons</h3>
+<div data-audit-control="DataPager">
+<table cellpadding="4" border="1" style="border-collapse: collapse;">
+	<thead>
+		<tr style="background-color: #507CD1; color: white;">
+			<th>ID</th>
+			<th>Name</th>
+			<th>Price</th>
+			<th>Category</th>
+		</tr>
+	</thead>
+	<tbody>
+		@foreach (var item in GetPagedItems())
+		{
+			<tr>
+				<td>@item.Id</td>
+				<td>@item.Name</td>
+				<td>@item.Price.ToString("C")</td>
+				<td>@item.Category</td>
+			</tr>
+		}
+	</tbody>
+</table>
+
+<br />
+
+<DataPager TotalRowCount="@_allProducts.Count"
+	PageSize="3"
+	PageIndex="@_pageIndex"
+	PageIndexChanged="HandlePageChanged"
+	Mode="PagerButtons.NumericFirstLast"
+	FirstPageText="« First"
+	LastPageText="Last »" />
+</div>
+
+@code {
+	private int _pageIndex = 0;
+
+	private List<ProductItem> _allProducts = Enumerable.Range(1, 12).Select(i => new ProductItem
+	{
+		Id = i,
+		Name = $"Product {i}",
+		Price = 9.99m + i,
+		Category = i % 2 == 0 ? "Hardware" : "Software"
+	}).ToList();
+
+	private List<ProductItem> GetPagedItems()
+	{
+		return _allProducts.Skip(_pageIndex * 3).Take(3).ToList();
+	}
+
+	private void HandlePageChanged(int newPage)
+	{
+		_pageIndex = newPage;
+	}
+
+	private class ProductItem
+	{
+		public int Id { get; set; }
+		public string Name { get; set; }
+		public decimal Price { get; set; }
+		public string Category { get; set; }
+	}
+}
+
+<hr />
+
+<p>Code:</p>
+<code>
+&lt;DataPager TotalRowCount="@@totalRows"<br />
+&nbsp;&nbsp;PageSize="3"<br />
+&nbsp;&nbsp;PageIndex="@@pageIndex"<br />
+&nbsp;&nbsp;PageIndexChanged="HandlePageChanged"<br />
+&nbsp;&nbsp;Mode="PagerButtons.NumericFirstLast" /&gt;
+</code>
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/DropDownList/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/DropDownList/Index.razor
index eef20947b..5a0993db3 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/DropDownList/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/DropDownList/Index.razor
@@ -15,55 +15,32 @@
 
 <h2>Data-bound DropDownList</h2>
 <div data-audit-control="DropDownList-3">
-    <DropDownList TItem="Product"
-              Items="products"
+    <DropDownList TItem="DataItem"
+              Items="dataBoundItems"
               DataTextField="Name"
               DataValueField="Id"
-              @bind-SelectedValue="selectedProduct" />
+              @bind-SelectedValue="selectedDataBound" />
 </div>
-<p>Selected Product ID: <strong>@selectedProduct</strong></p>
-<p>Selected Product: <strong>@(products.FirstOrDefault(p => p.Id == selectedProduct)?.Name ?? "None")</strong></p>
+<p>Selected Value: <strong>@selectedDataBound</strong></p>
 
-<h2>Data-bound with DataTextFormatString (Currency)</h2>
+<h2>Disabled DropDownList</h2>
 <div data-audit-control="DropDownList-4">
-    <DropDownList TItem="PricedProduct"
-              Items="pricedProducts"
-              DataTextField="Price"
-              DataValueField="Id"
-              DataTextFormatString="{0:C}"
-              @bind-SelectedValue="selectedPricedProduct" />
+    <DropDownList TItem="object" StaticItems="disabledItems" Enabled="false" SelectedValue="1" />
 </div>
-<p>Selected: <strong>@selectedPricedProduct</strong></p>
-<small>The <code>DataTextFormatString="{0:C}"</code> formats each item's text as currency.</small>
 
-<h2>Data-bound with DataTextFormatString (Prefix)</h2>
+<h2>With CSS Class</h2>
 <div data-audit-control="DropDownList-5">
-    <DropDownList TItem="Product"
-              Items="products"
-              DataTextField="Name"
-              DataValueField="Id"
-              DataTextFormatString="Item: {0}"
-              @bind-SelectedValue="selectedFormattedProduct" />
-</div>
-<p>Selected: <strong>@selectedFormattedProduct</strong></p>
-<small>The <code>DataTextFormatString="Item: {0}"</code> adds a prefix to each item's display text.</small>
-
-<h2>Disabled DropDownList</h2>
-<div data-audit-control="DropDownList-6">
-    <DropDownList TItem="object" StaticItems="staticItems" Enabled="false" SelectedValue="2" />
+    <DropDownList TItem="object" StaticItems="styledItems" CssClass="form-select" />
 </div>
 
-<h2>With CSS Class</h2>
-<DropDownList TItem="object" StaticItems="styledItems" CssClass="form-select" />
-<br />
-<small>Note: The form-select class is from Bootstrap and provides styling.</small>
-
 <h2>With Inline Styles</h2>
-<DropDownList TItem="object"
+<div data-audit-control="DropDownList-6">
+    <DropDownList TItem="object"
               StaticItems="colorItems"
               BackColor="new WebColor(System.Drawing.Color.LightYellow)"
               ForeColor="new WebColor(System.Drawing.Color.Navy)"
-              Font="new FontInfo { Bold = true }" />
+              Width="Unit.Pixel(200)" />
+</div>
 
 <h2>With Change Event</h2>
 <DropDownList TItem="object"
@@ -74,9 +51,7 @@
 
 @code {
     private string selectedStatic = "";
-    private string selectedProduct = "";
-    private string selectedPricedProduct = "";
-    private string selectedFormattedProduct = "";
+    private string selectedDataBound = "";
     private string eventSelection = "";
     private string lastSelection = "None";
     private DateTime lastChangeTime = DateTime.Now;
@@ -96,16 +71,19 @@
         new ListItem("Cherry", "cherry")
     };
 
+    private ListItemCollection disabledItems = new()
+    {
+        new ListItem("Cannot change", "1")
+    };
+
     private ListItemCollection styledItems = new()
     {
-        new ListItem("Styled Option", "1"),
-        new ListItem("Another Option", "2")
+        new ListItem("Styled", "1")
     };
 
     private ListItemCollection colorItems = new()
     {
-        new ListItem("Colored dropdown item", "1"),
-        new ListItem("Another colored item", "2")
+        new ListItem("Colored dropdown", "1")
     };
 
     private ListItemCollection eventItems = new()
@@ -116,20 +94,11 @@
         new ListItem("Third", "3")
     };
 
-    private List<Product> products = new()
-    {
-        new Product { Id = "1", Name = "Widget" },
-        new Product { Id = "2", Name = "Gadget" },
-        new Product { Id = "3", Name = "Gizmo" },
-        new Product { Id = "4", Name = "Doohickey" }
-    };
-
-    private List<PricedProduct> pricedProducts = new()
+    private List<DataItem> dataBoundItems = new()
     {
-        new PricedProduct { Id = "1", Price = 9.99m },
-        new PricedProduct { Id = "2", Price = 24.50m },
-        new PricedProduct { Id = "3", Price = 149.95m },
-        new PricedProduct { Id = "4", Price = 3.00m }
+        new DataItem { Id = "1", Name = "First Item" },
+        new DataItem { Id = "2", Name = "Second Item" },
+        new DataItem { Id = "3", Name = "Third Item" }
     };
 
     private void HandleSelectionChanged(ChangeEventArgs e)
@@ -139,17 +108,11 @@
         StateHasChanged();
     }
 
-    public class Product
+    public class DataItem
     {
         public string Id { get; set; }
         public string Name { get; set; }
     }
-
-    public class PricedProduct
-    {
-        public string Id { get; set; }
-        public decimal Price { get; set; }
-    }
 }
 
 <hr />
@@ -157,8 +120,7 @@
 <p>Code:</p>
 <code>
 &lt;DropDownList TItem="object" StaticItems="staticItems" @@bind-SelectedValue="selectedValue" /&gt;<br />
-&lt;DropDownList TItem="Product" Items="products" DataTextField="Name" DataValueField="Id" @@bind-SelectedValue="selectedProduct" /&gt;<br />
-&lt;DropDownList TItem="PricedProduct" Items="pricedProducts" DataTextField="Price" DataValueField="Id" DataTextFormatString="{0:C}" /&gt;<br />
-&lt;DropDownList TItem="Product" Items="products" DataTextField="Name" DataValueField="Id" DataTextFormatString="Item: {0}" /&gt;<br />
-&lt;DropDownList TItem="object" StaticItems="staticItems" Enabled="false" SelectedValue="2" /&gt;
+&lt;DropDownList TItem="DataItem" Items="dataBoundItems" DataTextField="Name" DataValueField="Id" @@bind-SelectedValue="selectedDataBound" /&gt;<br />
+&lt;DropDownList TItem="object" StaticItems="disabledItems" Enabled="false" SelectedValue="1" /&gt;<br />
+&lt;DropDownList TItem="object" StaticItems="styledItems" CssClass="form-select" /&gt;
 </code>
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/HiddenField/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/HiddenField/Index.razor
index 064f612a1..3247aa608 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/HiddenField/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/HiddenField/Index.razor
@@ -46,7 +46,7 @@
 &lt;Button Text="Update Hidden Field" OnClick="UpdateHiddenValue" /&gt;
 
 @@code {
-    private string HiddenValue = "initial-secret-value";
+    private string HiddenValue = "secret-value-123";
     private string NewValue = "";
     private string Message = "";
 
@@ -67,7 +67,7 @@
 }</code></pre>
 
 @code {
-    private string HiddenValue = "initial-secret-value";
+    private string HiddenValue = "secret-value-123";
     private string NewValue = "";
     private string Message = "";
 
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/HyperLink/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/HyperLink/Index.razor
index 5844c9513..57bf7fff4 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/HyperLink/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/HyperLink/Index.razor
@@ -3,27 +3,27 @@
 <h2>HyperLink Component</h2>
 
 <div data-audit-control="HyperLink-1">
-    <HyperLink NavigateUrl="https://www.github.com" Text="GitHub" />
+    <HyperLink NavigateUrl="https://bing.com" Text="Blue Button" BackColor="WebColor.Blue" ForeColor="WebColor.White" />
 </div>
 <br />
 <div data-audit-control="HyperLink-2">
-    <HyperLink NavigateUrl="https://www.github.com" Text="GitHub" Target="_blank" />
+    <HyperLink NavigateUrl="https://bing.com" Text="Blue Button" ToolTip="Navigate to Bing!" />
 </div>
 <br />
 <div data-audit-control="HyperLink-3">
-    <HyperLink NavigateUrl="https://www.github.com" Text="GitHub" Target="_blank" ToolTip="GitHub (Social Coding)" />
+    <HyperLink NavigateUrl="https://bing.com" Text="Blue Button" Visible="false" />
 </div>
 <br />
 <div data-audit-control="HyperLink-4">
-    <HyperLink NavigateUrl="https://www.github.com" Text="GitHub" Target="_blank" ToolTip="GitHub (Social Coding)" BackColor="WebColor.DimGray" ForeColor="WebColor.White" />
+    <HyperLink NavigateUrl="https://bing.com" Text="Blue Button" />
 </div>
 
 <hr />
 
 <p>Code:</p>
 <code>
-&lt;HyperLink NavigateUrl="https://www.github.com" Text="GitHub" /&gt;<br />
-&lt;HyperLink NavigateUrl="https://www.github.com" Text="GitHub" Target="_blank" /&gt;<br />
-&lt;HyperLink NavigateUrl="https://www.github.com" Text="GitHub" Target="_blank" ToolTip="GitHub (Social Coding)" /&gt;<br />
-&lt;HyperLink NavigateUrl="https://www.github.com" Text="GitHub" Target="_blank" ToolTip="GitHub (Social Coding)" BackColor="WebColor.DimGray" ForeColor="WebColor.White" /&gt;
+&lt;HyperLink NavigateUrl="https://bing.com" Text="Blue Button" BackColor="WebColor.Blue" ForeColor="WebColor.White" /&gt;<br />
+&lt;HyperLink NavigateUrl="https://bing.com" Text="Blue Button" ToolTip="Navigate to Bing!" /&gt;<br />
+&lt;HyperLink NavigateUrl="https://bing.com" Text="Blue Button" Visible="false" /&gt;<br />
+&lt;HyperLink NavigateUrl="https://bing.com" Text="Blue Button" /&gt;
 </code>
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Image/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Image/Index.razor
index 703c71f2c..ea189184e 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Image/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Image/Index.razor
@@ -15,32 +15,34 @@
 
 <div class="demo-section">
     <div data-audit-control="Image-1">
-        <Image ImageUrl="/img/placeholder-150x100.svg" 
-           AlternateText="Sample placeholder image" />
+        <Image ImageUrl="/Content/Images/banner.png" 
+           AlternateText="Banner image" />
     </div>
 </div>
 
 <p>Code:</p>
-<pre><code>&lt;Image ImageUrl="https://via.placeholder.com/150x100" 
-       AlternateText="Sample placeholder image" /&gt;</code></pre>
+<pre><code>&lt;Image ImageUrl="/Content/Images/banner.png" 
+       AlternateText="Banner image" /&gt;</code></pre>
 
 <hr />
 
-<h3>Image with Tooltip</h3>
-<p>Hover over the image to see the tooltip:</p>
+<h3>Sized Image</h3>
+<p>An image with explicit width and height:</p>
 
 <div class="demo-section">
     <div data-audit-control="Image-2">
-        <Image ImageUrl="/img/placeholder-150x100.svg" 
-           AlternateText="Image with tooltip"
-           ToolTip="This is a tooltip displayed on hover" />
+        <Image ImageUrl="/Content/Images/banner.png" 
+           AlternateText="Sized image"
+           Width="Unit.Pixel(200)"
+           Height="Unit.Pixel(100)" />
     </div>
 </div>
 
 <p>Code:</p>
-<pre><code>&lt;Image ImageUrl="https://via.placeholder.com/150x100/0066cc/ffffff?text=Hover+Me" 
-       AlternateText="Image with tooltip"
-       ToolTip="This is a tooltip displayed on hover" /&gt;</code></pre>
+<pre><code>&lt;Image ImageUrl="/Content/Images/banner.png" 
+       AlternateText="Sized image"
+       Width="Unit.Pixel(200)"
+       Height="Unit.Pixel(100)" /&gt;</code></pre>
 
 <hr />
 
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/ImageMap/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/ImageMap/Index.razor
index dbd82a4ea..0fffb800e 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/ImageMap/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/ImageMap/Index.razor
@@ -18,18 +18,17 @@
 
 <div class="demo-section">
     <div data-audit-control="ImageMap">
-        <ImageMap ImageUrl="/img/placeholder-400x200.svg"
-              AlternateText="Navigation demo image"
+        <ImageMap ImageUrl="/Content/Images/banner.png"
+              AlternateText="Navigate"
               HotSpotMode="HotSpotMode.Navigate"
               HotSpots="@navigationHotSpots" />
     </div>
 </div>
 
-<p>The image above has three hot spots defined:</p>
+<p>The image above has two hot spots defined:</p>
 <ul>
-    <li><strong>Left rectangle</strong> (0,0 → 130,200) — navigates to the Button sample</li>
-    <li><strong>Center circle</strong> (200,100 radius 60) — navigates to the CheckBox sample</li>
-    <li><strong>Right rectangle</strong> (270,0 → 400,200) — navigates to the Image sample</li>
+    <li><strong>Left rectangle</strong> (0,0 → 100,50) — navigates to Bing</li>
+    <li><strong>Right rectangle</strong> (100,0 → 200,50) — navigates to GitHub</li>
 </ul>
 
 <p>Code:</p>
@@ -182,26 +181,20 @@ new RectangleHotSpot {
     private string mixedClickResult;
     private string polygonClickResult;
 
-    // Navigation mode hot spots
+    // Navigation mode hot spots — matching WebForms audit
     private List<HotSpot> navigationHotSpots = new()
     {
         new RectangleHotSpot
         {
-            Left = 0, Top = 0, Right = 130, Bottom = 200,
-            NavigateUrl = "/ControlSamples/Button",
-            AlternateText = "Go to Button samples"
-        },
-        new CircleHotSpot
-        {
-            X = 200, Y = 100, Radius = 60,
-            NavigateUrl = "/ControlSamples/CheckBox",
-            AlternateText = "Go to CheckBox samples"
+            Left = 0, Top = 0, Right = 100, Bottom = 50,
+            NavigateUrl = "https://bing.com",
+            AlternateText = "Go to Bing"
         },
         new RectangleHotSpot
         {
-            Left = 270, Top = 0, Right = 400, Bottom = 200,
-            NavigateUrl = "/ControlSamples/Image",
-            AlternateText = "Go to Image samples"
+            Left = 100, Top = 0, Right = 200, Bottom = 50,
+            NavigateUrl = "https://github.com",
+            AlternateText = "Go to GitHub"
         }
     };
 
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Label/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Label/Index.razor
index efb16648e..ed3bb0370 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Label/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Label/Index.razor
@@ -11,24 +11,36 @@ matching the behavior of the ASP.NET Web Forms Label control.</p>
 <h3>Basic Label</h3>
 
 <div data-audit-control="Label-1">
-    <Label Text="Hello, World!" />
+    <Label Text="Hello World" />
 </div>
 
-<pre><code>&lt;Label Text="Hello, World!" /&gt;</code></pre>
+<pre><code>&lt;Label Text="Hello World" /&gt;</code></pre>
 
 <hr />
 
 <h3>Styled Label</h3>
 
 <div data-audit-control="Label-2">
-    <Label Text="Important notice"
-       CssClass="text-danger fw-bold"
-       ForeColor="WebColor.Red" />
+    <Label Text="Styled Label"
+       CssClass="text-primary"
+       ForeColor="WebColor.Blue"
+       Font-Bold="true" />
 </div>
 
-<pre><code>&lt;Label Text="Important notice"
-       CssClass="text-danger fw-bold"
-       ForeColor="WebColor.Red" /&gt;</code></pre>
+<pre><code>&lt;Label Text="Styled Label"
+       CssClass="text-primary"
+       ForeColor="WebColor.Blue"
+       Font-Bold="true" /&gt;</code></pre>
+
+<hr />
+
+<h3>Label with HTML</h3>
+
+<div data-audit-control="Label-3">
+    <Label Text="&lt;em&gt;Emphasized&lt;/em&gt;" />
+</div>
+
+<pre><code>&lt;Label Text="&amp;lt;em&amp;gt;Emphasized&amp;lt;/em&amp;gt;" /&gt;</code></pre>
 
 <hr />
 
@@ -39,9 +51,7 @@ element instead of a <code>&lt;span&gt;</code>. This associates the label with a
 clicking the label focuses the input, and screen readers announce the relationship.</p>
 
 <div class="mb-3">
-    <div data-audit-control="Label-3">
-        <Label Text="Email Address:" AssociatedControlID="emailInput" CssClass="form-label" />
-    </div>
+    <Label Text="Email Address:" AssociatedControlID="emailInput" CssClass="form-label" />
     <TextBox id="emailInput"
              TextMode="TextBoxMode.Email"
              Placeholder="you@example.com"
@@ -64,18 +74,5 @@ clicking the label focuses the input, and screen readers announce the relationsh
 &lt;Label Text="Full Name:" AssociatedControlID="nameInput" CssClass="form-label" /&gt;
 &lt;TextBox id="nameInput" Placeholder="Enter your full name" CssClass="form-control" /&gt;</code></pre>
 
-<hr />
-
-<h4>Without AssociatedControlID (default)</h4>
-<p>Without <code>AssociatedControlID</code>, the Label renders as a <code>&lt;span&gt;</code>:</p>
-
-<Label Text="This renders as a span" />
-
-<pre><code>&lt;!-- Renders: &lt;span&gt;This renders as a span&lt;/span&gt; --&gt;
-&lt;Label Text="This renders as a span" /&gt;
-
-&lt;!-- Renders: &lt;label for="emailInput"&gt;Email Address:&lt;/label&gt; --&gt;
-&lt;Label Text="Email Address:" AssociatedControlID="emailInput" /&gt;</code></pre>
-
 @code {
 }
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LinkButton/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LinkButton/Index.razor
index 5c5241623..4491b9149 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LinkButton/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LinkButton/Index.razor
@@ -5,42 +5,29 @@
 <Nav></Nav>
 
 <div data-audit-control="LinkButton-1">
-    <LinkButton CommandName="Foo" CommandArgument="bar1" OnCommand="OnCommand" Text="LinkButton1 with Command" />
+    <LinkButton OnClick="OnClick" Text="Click Me" CssClass="btn btn-primary" />
 </div>
 <br />
 <div data-audit-control="LinkButton-2">
-    <LinkButton CommandName="Foo" CommandArgument="bar2" OnCommand="OnCommand" Text="LinkButton2 with Command" />
+    <LinkButton OnClick="OnClick" Text="Submit Form" />
 </div>
 <br />
 <div data-audit-control="LinkButton-3">
-    <LinkButton OnClick="OnClick" Text="Click me!!" PostBackUrl="ControlSamples/LinkButton/#" />
+    <LinkButton Text="Disabled Link" Enabled="false" />
 </div>
 <br />
-<LinkButton CommandName="Foo" CommandArgument="bar3" OnCommand="OnCommand" OnClick="OnClick" Text="BlazorWebFormsComponents" PostBackUrl="https://github.com/FritzAndFriends/BlazorWebFormsComponents" />
+<LinkButton OnClick="OnClick" Text="BlazorWebFormsComponents" PostBackUrl="https://github.com/FritzAndFriends/BlazorWebFormsComponents" />
 <br />
-<p style="font-weight: bold">@ContentMessage<br />@CommandMessage</p>
+<p style="font-weight: bold">@ContentMessage</p>
 
 @code {
 	[Parameter]
 	public string ContentMessage { get; set; } = "Not clicked yet!";
 
-	[Parameter]
-	public string CommandMessage { get; set; } = "No command fired!";
-
-	public string bar1 = "Bar 1";
-	public string bar2 = "Bar 2";
-	public string bar3 = "Bar 3";
-
 	void OnClick()
 	{
 		ContentMessage = "I've been clicked";
 	}
-
-	void OnCommand(CommandEventArgs args)
-	{
-		Console.WriteLine("Command fired");
-		CommandMessage = $"Command '{args.CommandName}', Argument '{args.CommandArgument}'";
-	}
 }
 
 <hr />
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Literal/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Literal/Index.razor
index 467c5e3c5..1c141d502 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Literal/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Literal/Index.razor
@@ -5,11 +5,11 @@
 <h2>Literal Component</h2>
 
 <div data-audit-control="Literal-1">
-    <Literal Mode="LiteralMode.PassThrough" Text="<b>Literal</b>"></Literal>
+    <Literal Mode="LiteralMode.PassThrough" Text="This is <b>literal</b> content."></Literal>
 </div>
 <br/>
 <div data-audit-control="Literal-2">
-    <Literal Text="<b>Literal</b>"></Literal>
+    <Literal Mode="LiteralMode.Encode" Text="This is <b>encoded</b> content."></Literal>
 </div>
 <br/>
 <div data-audit-control="Literal-3">
@@ -22,7 +22,7 @@
 Code:
 </p>
 <code>
-&lt;Literal Mode="LiteralMode.PassThrough" Text="&lt;b&gt;Literal&lt;/b&gt;"&gt;&lt;/Literal&gt;
+&lt;Literal Mode="LiteralMode.PassThrough" Text="This is &lt;b&gt;literal&lt;/b&gt; content."&gt;&lt;/Literal&gt;
 <br/>
-&lt;Literal Text="&lt;b&gt;Literal&lt;/b&gt;"&gt;&lt;/Literal&gt;
+&lt;Literal Mode="LiteralMode.Encode" Text="This is &lt;b&gt;encoded&lt;/b&gt; content."&gt;&lt;/Literal&gt;
 </code>
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginNameSample.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginNameSample.razor
index 1cefbf049..0bd6f8589 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginNameSample.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginNameSample.razor
@@ -5,8 +5,10 @@
 @using BlazorWebFormsComponents.LoginControls;
 
 
+<div data-audit-control="LoginName-1">
 <LoginName BackColor="@("#FFFFFF")"
 					 FormatString="The name is {0}!" />
+</div>
 
 
 
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginSample.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginSample.razor
index 1ce30e62c..bb93a9987 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginSample.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginSample.razor
@@ -5,6 +5,7 @@
 @using BlazorWebFormsComponents.LoginControls;
 
 
+<div data-audit-control="Login-1">
 <Login InstructionText="How to Login!!">
 	<ChildContent>
 		<InstructionTextStyle BackColor="@("#FF0000")"
@@ -12,6 +13,7 @@
 		<ValidatorTextStyle ForeColor="@("#0000ff")" />
 	</ChildContent>
 </Login>
+</div>
 
 
 
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginStatusAuthenticated.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginStatusAuthenticated.razor
index a34eaddb9..8cc1ae904 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginStatusAuthenticated.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginStatusAuthenticated.razor
@@ -6,9 +6,11 @@
 <h3>LoginStatus Authenticated</h3>
 
 
+<div data-audit-control="LoginStatus-1">
 <LoginStatus BackColor="@("#FF00FF")"
 						 LogoutPageUrl="LoginPageUrl"
 						 LogoutAction="Redirect" />
+</div>
 
 
 
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginStatusNotAuthenticated.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginStatusNotAuthenticated.razor
index 904b355bd..fe0b28e14 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginStatusNotAuthenticated.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginControls/LoginStatusNotAuthenticated.razor
@@ -5,8 +5,10 @@
 <h3>LoginStatus Not Authenticated</h3>
 
 
+<div data-audit-control="LoginStatus-2">
 <LoginStatus BackColor="@("#FF00FF")"
 						 LoginPageUrl="LoginPageUrl"/>
+</div>
 
 
 @code
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginView/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginView/Index.razor
new file mode 100644
index 000000000..3994336cf
--- /dev/null
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/LoginView/Index.razor
@@ -0,0 +1,46 @@
+@page "/ControlSamples/LoginView"
+@using BlazorWebFormsComponents.LoginControls
+
+<h2>LoginView Component</h2>
+
+<Nav />
+
+<p>
+	The <code>LoginView</code> component displays different content depending on whether
+	the user is authenticated. Use <code>AnonymousTemplate</code> and <code>LoggedInTemplate</code>
+	to define the content for each state.
+</p>
+
+<h3>LoginView with Templates</h3>
+<div data-audit-control="LoginView-1">
+<LoginView>
+	<AnonymousTemplate>
+		<p>You are not logged in. Please <a href="#">sign in</a> to access member content.</p>
+	</AnonymousTemplate>
+	<LoggedInTemplate>
+		<p>Welcome back! You are logged in.</p>
+	</LoggedInTemplate>
+</LoginView>
+</div>
+
+@code {
+	protected override void OnInitialized()
+	{
+		StaticAuthStateProvider.Logout();
+		base.OnInitialized();
+	}
+}
+
+<hr />
+
+<p>Code:</p>
+<code>
+&lt;LoginView&gt;<br />
+&nbsp;&nbsp;&lt;AnonymousTemplate&gt;<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&lt;p&gt;You are not logged in.&lt;/p&gt;<br />
+&nbsp;&nbsp;&lt;/AnonymousTemplate&gt;<br />
+&nbsp;&nbsp;&lt;LoggedInTemplate&gt;<br />
+&nbsp;&nbsp;&nbsp;&nbsp;&lt;p&gt;Welcome back!&lt;/p&gt;<br />
+&nbsp;&nbsp;&lt;/LoggedInTemplate&gt;<br />
+&lt;/LoginView&gt;
+</code>
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/MultiView/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/MultiView/Index.razor
index 94468a986..b95b668a1 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/MultiView/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/MultiView/Index.razor
@@ -12,6 +12,7 @@
 <h3>Basic MultiView</h3>
 <p>Current View: @(activeIndex + 1) of 3</p>
 
+<div data-audit-control="MultiView-1">
 <MultiView ActiveViewIndex="@activeIndex">
 	<View>
 		<div style="padding: 10px; border: 1px solid #ccc;">
@@ -36,6 +37,7 @@
 		</div>
 	</View>
 </MultiView>
+</div>
 
 @code {
 	private int activeIndex = 0;
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Panel/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Panel/Index.razor
index 466635e97..a32c73971 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Panel/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Panel/Index.razor
@@ -3,51 +3,48 @@
 
 <h2>Panel Component Samples</h2>
 
-<h3>Basic Panel</h3>
+<h3>Basic Panel with GroupingText</h3>
 <div data-audit-control="Panel-1">
-    <Panel>
-	<p>This content is inside a basic Panel.</p>
-	<p>A Panel renders as a div element by default.</p>
+    <Panel GroupingText="User Info">
+	<Label Text="Name:" />
+	<TextBox />
     </Panel>
 </div>
-<pre><code>&lt;Panel&gt;
-    &lt;p&gt;This content is inside a basic Panel.&lt;/p&gt;
+<pre><code>&lt;Panel GroupingText="User Info"&gt;
+    &lt;Label Text="Name:" /&gt;
+    &lt;TextBox /&gt;
 &lt;/Panel&gt;</code></pre>
 
 <hr />
 
-<h3>Panel with GroupingText (Fieldset)</h3>
+<h3>Panel with ScrollBars</h3>
 <div data-audit-control="Panel-2">
-    <Panel GroupingText="User Information">
-	<p>Name: John Doe</p>
-	<p>Email: john@example.com</p>
+    <Panel ScrollBars="ScrollBars.Auto" Height="Unit.Pixel(100)">
+	<p>First paragraph of content inside the scrollable panel.</p>
+	<p>Second paragraph of content inside the scrollable panel.</p>
+	<p>Third paragraph of content inside the scrollable panel.</p>
+	<p>Fourth paragraph of content inside the scrollable panel.</p>
     </Panel>
 </div>
-<pre><code>&lt;Panel GroupingText="User Information"&gt;
-    &lt;p&gt;Name: John Doe&lt;/p&gt;
-    &lt;p&gt;Email: john@example.com&lt;/p&gt;
+<pre><code>&lt;Panel ScrollBars="ScrollBars.Auto" Height="Unit.Pixel(100)"&gt;
+    &lt;p&gt;First paragraph of content inside the scrollable panel.&lt;/p&gt;
+    &lt;p&gt;Second paragraph of content inside the scrollable panel.&lt;/p&gt;
+    &lt;p&gt;Third paragraph of content inside the scrollable panel.&lt;/p&gt;
+    &lt;p&gt;Fourth paragraph of content inside the scrollable panel.&lt;/p&gt;
 &lt;/Panel&gt;</code></pre>
 
 <hr />
 
-<h3>Panel with Styling</h3>
+<h3>Panel with DefaultButton</h3>
 <div data-audit-control="Panel-3">
-    <Panel BackColor="WebColor.LightYellow" 
-       ForeColor="WebColor.Navy"
-       BorderColor="WebColor.Blue"
-       BorderWidth="Unit.Pixel(2)"
-       BorderStyle="BorderStyle.Solid"
-       Width="Unit.Pixel(300)">
-	<p>This panel has custom colors and border.</p>
+    <Panel DefaultButton="btnSubmit">
+	<TextBox />
+	<Button ID="btnSubmit" Text="Submit" />
     </Panel>
 </div>
-<pre><code>&lt;Panel BackColor="WebColor.LightYellow" 
-       ForeColor="WebColor.Navy"
-       BorderColor="WebColor.Blue"
-       BorderWidth="Unit.Pixel(2)"
-       BorderStyle="BorderStyle.Solid"
-       Width="Unit.Pixel(300)"&gt;
-    &lt;p&gt;This panel has custom colors and border.&lt;/p&gt;
+<pre><code>&lt;Panel DefaultButton="btnSubmit"&gt;
+    &lt;TextBox /&gt;
+    &lt;Button ID="btnSubmit" Text="Submit" /&gt;
 &lt;/Panel&gt;</code></pre>
 
 <hr />
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/PasswordRecovery/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/PasswordRecovery/Index.razor
index b14886b91..c791c6ae9 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/PasswordRecovery/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/PasswordRecovery/Index.razor
@@ -17,10 +17,12 @@
    Handle <code>OnVerifyingUser</code> to validate the username and set the security question
    via the <code>SetQuestion</code> method. Handle <code>OnVerifyingAnswer</code> to verify the answer.</p>
 
+<div data-audit-control="PasswordRecovery-1">
 <PasswordRecovery ID="PasswordRecovery1"
     OnVerifyingUser="HandleVerifyingUser"
     OnVerifyingAnswer="HandleVerifyingAnswer"
     OnSendingMail="HandleSendingMail" />
+</div>
 
 <p style="margin-top: 10px; font-weight: bold;">@_statusMessage</p>
 
@@ -56,6 +58,7 @@
 <h3>Custom Text Properties</h3>
 <p>Customize labels, titles, and messages for each step using the text properties.</p>
 
+<div data-audit-control="PasswordRecovery-2">
 <PasswordRecovery ID="PasswordRecovery2"
     UserNameTitleText="Password Reset"
     UserNameInstructionText="Please enter your email address below."
@@ -66,6 +69,7 @@
     SuccessText="A password reset link has been sent to your email."
     OnVerifyingUser="HandleVerifyingUser2"
     OnVerifyingAnswer="HandleVerifyingAnswer2" />
+</div>
 
 <p>Code:</p>
 <pre><code>&lt;PasswordRecovery ID="PasswordRecovery2"
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/PlaceHolder/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/PlaceHolder/Index.razor
index efb3fbda6..20eaf1492 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/PlaceHolder/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/PlaceHolder/Index.razor
@@ -9,8 +9,8 @@
 <h3>Basic PlaceHolder</h3>
 <div data-audit-control="PlaceHolder">
     <PlaceHolder>
-	<p>This content is inside a PlaceHolder.</p>
-	<p>Note: No extra wrapper element is rendered around this content.</p>
+	<p>This content was added programmatically.</p>
+	<p>PlaceHolder renders no HTML of its own.</p>
     </PlaceHolder>
 </div>
 <pre><code>&lt;PlaceHolder&gt;
diff --git a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Table/Index.razor b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Table/Index.razor
index 8c6ff9ddb..56a3321f2 100644
--- a/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Table/Index.razor
+++ b/samples/AfterBlazorServerSide/Components/Pages/ControlSamples/Table/Index.razor
@@ -64,6 +64,7 @@
 <hr />
 
 <h3>Table with Grid Lines</h3>
+<div data-audit-control="Table-3">
 <TableComponent GridLines="BlazorWebFormsComponents.Enums.GridLines.Both" CellPadding="5">
 	<TableRowComponent>
 		<TableHeaderCellComponent>Name</TableHeaderCellComponent>
@@ -81,6 +82,7 @@
 		<TableCellComponent>Los Angeles</TableCellComponent>
 	</TableRowComponent>
 </TableComponent>
+</div>
 <pre><code>&lt;Table GridLines="GridLines.Both" CellPadding="5"&gt;
     ...
 &lt;/Table&gt;</code></pre>
diff --git a/samples/AfterBlazorServerSide/wwwroot/Content/Images/banner.png b/samples/AfterBlazorServerSide/wwwroot/Content/Images/banner.png
new file mode 100644
index 000000000..b3e42ca8e
Binary files /dev/null and b/samples/AfterBlazorServerSide/wwwroot/Content/Images/banner.png differ
diff --git a/src/BlazorWebFormsComponents.Test/BulletedList/BulletStyle.razor b/src/BlazorWebFormsComponents.Test/BulletedList/BulletStyle.razor
index b04993868..2ec1c9081 100644
--- a/src/BlazorWebFormsComponents.Test/BulletedList/BulletStyle.razor
+++ b/src/BlazorWebFormsComponents.Test/BulletedList/BulletStyle.razor
@@ -91,7 +91,7 @@
 		// Assert
 		var ol = cut.Find("ol");
 		ol.ShouldNotBeNull();
-		ol.GetAttribute("type").ShouldBe("1");
+		ol.GetAttribute("style").ShouldContain("list-style-type: decimal");
 	}
 
 	[Fact]
@@ -109,7 +109,7 @@
 		// Assert
 		var ol = cut.Find("ol");
 		ol.ShouldNotBeNull();
-		ol.GetAttribute("type").ShouldBe("a");
+		ol.GetAttribute("style").ShouldContain("list-style-type: lower-alpha");
 	}
 
 	[Fact]
@@ -126,7 +126,8 @@
 
 		// Assert
 		var ol = cut.Find("ol");
-		ol.GetAttribute("type").ShouldBe("A");
+		ol.ShouldNotBeNull();
+		ol.GetAttribute("style").ShouldContain("list-style-type: upper-alpha");
 	}
 
 	[Fact]
@@ -143,7 +144,8 @@
 
 		// Assert
 		var ol = cut.Find("ol");
-		ol.GetAttribute("type").ShouldBe("i");
+		ol.ShouldNotBeNull();
+		ol.GetAttribute("style").ShouldContain("list-style-type: lower-roman");
 	}
 
 	[Fact]
@@ -160,7 +162,8 @@
 
 		// Assert
 		var ol = cut.Find("ol");
-		ol.GetAttribute("type").ShouldBe("I");
+		ol.ShouldNotBeNull();
+		ol.GetAttribute("style").ShouldContain("list-style-type: upper-roman");
 	}
 
 	[Fact]
@@ -199,4 +202,38 @@
 		ol.GetAttribute("start").ShouldBe("5");
 	}
 
+	[Fact]
+	public void BulletedList_DefaultFirstBulletNumber_NoStartAttribute()
+	{
+		// Arrange
+		var items = new ListItemCollection
+		{
+			new ListItem("Item 1", "1")
+		};
+
+		// Act
+		var cut = Render(@<BulletedList TItem="object" StaticItems="items" BulletStyle="BulletStyleEnum.Numbered" />);
+
+		// Assert
+		var ol = cut.Find("ol");
+		ol.HasAttribute("start").ShouldBeFalse();
+	}
+
+	[Fact]
+	public void BulletedList_NumberedStyle_NoTypeAttribute()
+	{
+		// Arrange — WebForms uses CSS list-style-type, not the HTML type attribute
+		var items = new ListItemCollection
+		{
+			new ListItem("Item 1", "1")
+		};
+
+		// Act
+		var cut = Render(@<BulletedList TItem="object" StaticItems="items" BulletStyle="BulletStyleEnum.Numbered" />);
+
+		// Assert
+		var ol = cut.Find("ol");
+		ol.HasAttribute("type").ShouldBeFalse();
+	}
+
 }
diff --git a/src/BlazorWebFormsComponents.Test/CheckBox/NoSpanWrapper.razor b/src/BlazorWebFormsComponents.Test/CheckBox/NoSpanWrapper.razor
new file mode 100644
index 000000000..30e110c56
--- /dev/null
+++ b/src/BlazorWebFormsComponents.Test/CheckBox/NoSpanWrapper.razor
@@ -0,0 +1,27 @@
+@inherits BlazorWebFormsTestContext
+@using Shouldly
+
+@code {
+
+	[Fact]
+	public void CheckBox_WithText_NoSpanWrapper()
+	{
+		// WebForms CheckBox renders <input> and <label> directly, no <span> wrapper
+		var cut = Render(@<CheckBox Text="Accept terms" />);
+
+		Should.Throw<Bunit.ElementNotFoundException>(() => cut.Find("span"));
+		cut.Find("input[type='checkbox']").ShouldNotBeNull();
+		cut.Find("label").ShouldNotBeNull();
+	}
+
+	[Fact]
+	public void CheckBox_WithoutText_NoSpanWrapper()
+	{
+		// WebForms CheckBox without text renders just <input>, no <span> wrapper
+		var cut = Render(@<CheckBox />);
+
+		Should.Throw<Bunit.ElementNotFoundException>(() => cut.Find("span"));
+		cut.Find("input[type='checkbox']").ShouldNotBeNull();
+	}
+
+}
diff --git a/src/BlazorWebFormsComponents.Test/FileUpload/IdRendering.razor b/src/BlazorWebFormsComponents.Test/FileUpload/IdRendering.razor
new file mode 100644
index 000000000..09e01aa35
--- /dev/null
+++ b/src/BlazorWebFormsComponents.Test/FileUpload/IdRendering.razor
@@ -0,0 +1,26 @@
+@inherits BlazorWebFormsTestContext
+@using Shouldly
+
+@code {
+
+	[Fact]
+	public void FileUpload_WithID_RendersExactId()
+	{
+		// WebForms renders the developer-set ID with no GUID suffix
+		var cut = Render(@<FileUpload ID="myUpload" />);
+
+		var input = cut.Find("input[type='file']");
+		input.GetAttribute("id").ShouldBe("myUpload");
+	}
+
+	[Fact]
+	public void FileUpload_WithoutID_NoIdAttribute()
+	{
+		// WebForms does not render an id when none is set
+		var cut = Render(@<FileUpload />);
+
+		var input = cut.Find("input[type='file']");
+		input.HasAttribute("id").ShouldBeFalse();
+	}
+
+}
diff --git a/src/BlazorWebFormsComponents.Test/GridView/AccessibleHeaderDefault.razor b/src/BlazorWebFormsComponents.Test/GridView/AccessibleHeaderDefault.razor
new file mode 100644
index 000000000..41b3345cf
--- /dev/null
+++ b/src/BlazorWebFormsComponents.Test/GridView/AccessibleHeaderDefault.razor
@@ -0,0 +1,60 @@
+@inherits BlazorWebFormsTestContext
+@using Shouldly
+
+@code {
+
+	[Fact]
+	public void GridView_DefaultUseAccessibleHeader_RendersThWithScope()
+	{
+		// WebForms defaults UseAccessibleHeader to true, rendering <th scope="col">
+		var data = GetTestItems();
+
+		var cut = Render(@<GridView ItemType="AccessibleHeaderTestItem" DataSource="data" AutoGenerateColumns="false">
+			<Columns>
+				<BoundField ItemType="AccessibleHeaderTestItem" DataField="Name" HeaderText="Name" />
+			</Columns>
+		</GridView>);
+
+		var headers = cut.FindAll("th");
+		headers.Count.ShouldBeGreaterThan(0);
+		foreach (var header in headers)
+		{
+			header.GetAttribute("scope").ShouldBe("col");
+		}
+	}
+
+	[Fact]
+	public void GridView_UseAccessibleHeaderFalse_NoScope()
+	{
+		var data = GetTestItems();
+
+		var cut = Render(@<GridView ItemType="AccessibleHeaderTestItem" DataSource="data" AutoGenerateColumns="false"
+						UseAccessibleHeader="false">
+			<Columns>
+				<BoundField ItemType="AccessibleHeaderTestItem" DataField="Name" HeaderText="Name" />
+			</Columns>
+		</GridView>);
+
+		var headers = cut.FindAll("th");
+		headers.Count.ShouldBeGreaterThan(0);
+		foreach (var header in headers)
+		{
+			header.HasAttribute("scope").ShouldBeFalse();
+		}
+	}
+
+	private List<AccessibleHeaderTestItem> GetTestItems()
+	{
+		return new List<AccessibleHeaderTestItem>
+		{
+			new AccessibleHeaderTestItem { Id = 1, Name = "Alpha" },
+			new AccessibleHeaderTestItem { Id = 2, Name = "Beta" }
+		};
+	}
+
+	public class AccessibleHeaderTestItem
+	{
+		public int Id { get; set; }
+		public string Name { get; set; }
+	}
+}
diff --git a/src/BlazorWebFormsComponents.Test/Image/DescriptionUrl.razor b/src/BlazorWebFormsComponents.Test/Image/DescriptionUrl.razor
new file mode 100644
index 000000000..c2ae720f4
--- /dev/null
+++ b/src/BlazorWebFormsComponents.Test/Image/DescriptionUrl.razor
@@ -0,0 +1,27 @@
+
+@code {
+	[Fact]
+	public void Image_WithDescriptionUrl_RendersLongDescAttribute()
+	{
+		var cut = Render(@<Image ImageUrl="/img/test.png" AlternateText="Test" DescriptionUrl="http://example.com/desc" />);
+		var img = cut.Find("img");
+		img.HasAttribute("longdesc").ShouldBeTrue();
+		img.GetAttribute("longdesc").ShouldBe("http://example.com/desc");
+	}
+
+	[Fact]
+	public void Image_WithoutDescriptionUrl_NoLongDescAttribute()
+	{
+		var cut = Render(@<Image ImageUrl="/img/test.png" AlternateText="Test" />);
+		var img = cut.Find("img");
+		img.HasAttribute("longdesc").ShouldBeFalse();
+	}
+
+	[Fact]
+	public void Image_EmptyDescriptionUrl_NoLongDescAttribute()
+	{
+		var cut = Render(@<Image ImageUrl="/img/test.png" AlternateText="Test" DescriptionUrl="" />);
+		var img = cut.Find("img");
+		img.HasAttribute("longdesc").ShouldBeFalse();
+	}
+}
diff --git a/src/BlazorWebFormsComponents.Test/LinkButton/Format.razor b/src/BlazorWebFormsComponents.Test/LinkButton/Format.razor
index 4d471d4fa..7f84dc8f7 100644
--- a/src/BlazorWebFormsComponents.Test/LinkButton/Format.razor
+++ b/src/BlazorWebFormsComponents.Test/LinkButton/Format.razor
@@ -6,4 +6,45 @@ public void LinkButton_RendersAnchor_WithTextAndPostBackUrl()
 var cut = Render(@<LinkButton Text="Go to Bing!!" PostBackUrl="https://www.bing.com" />);
 cut.MarkupMatches(@<a href="https://www.bing.com" >Go to Bing!!</a>);
 }
+
+[Fact]
+public void LinkButton_CssClass_RendersClassAttribute()
+{
+	var cut = Render(@<LinkButton Text="Click Me" CssClass="btn btn-primary" />);
+	var a = cut.Find("a");
+	a.GetAttribute("class").ShouldBe("btn btn-primary");
+}
+
+[Fact]
+public void LinkButton_NoCssClass_NoClassAttribute()
+{
+	var cut = Render(@<LinkButton Text="Click Me" />);
+	var a = cut.Find("a");
+	a.HasAttribute("class").ShouldBeFalse();
+}
+
+[Fact]
+public void LinkButton_Disabled_RendersAspNetDisabledClass()
+{
+	var cut = Render(@<LinkButton Text="Click Me" Enabled="false" />);
+	var a = cut.Find("a");
+	a.GetAttribute("class").ShouldContain("aspNetDisabled");
+}
+
+[Fact]
+public void LinkButton_DisabledWithCssClass_RendersBothClasses()
+{
+	var cut = Render(@<LinkButton Text="Click Me" CssClass="btn" Enabled="false" />);
+	var a = cut.Find("a");
+	a.GetAttribute("class").ShouldContain("btn");
+	a.GetAttribute("class").ShouldContain("aspNetDisabled");
+}
+
+[Fact]
+public void LinkButton_CssClass_WithPostBackUrl_RendersClassAttribute()
+{
+	var cut = Render(@<LinkButton Text="Go" PostBackUrl="https://example.com" CssClass="my-link" />);
+	var a = cut.Find("a");
+	a.GetAttribute("class").ShouldBe("my-link");
+}
 }
diff --git a/src/BlazorWebFormsComponents/BulletedList.razor b/src/BlazorWebFormsComponents/BulletedList.razor
index 3e5fd63bb..e6aef21a9 100644
--- a/src/BlazorWebFormsComponents/BulletedList.razor
+++ b/src/BlazorWebFormsComponents/BulletedList.razor
@@ -9,7 +9,7 @@
 	
 	@if (IsOrderedList)
 	{
-		<ol id="@ClientID" class="@CssClass" style="@CombinedStyle" type="@OrderedListType" start="@FirstBulletNumber" title="@ToolTip">
+		<ol id="@ClientID" class="@CssClass" style="@CombinedStyle" start="@GetStartAttribute()" title="@ToolTip">
 			@RenderListItems(allItems)
 		</ol>
 	}
diff --git a/src/BlazorWebFormsComponents/BulletedList.razor.cs b/src/BlazorWebFormsComponents/BulletedList.razor.cs
index 5b6892413..7470f7cc4 100644
--- a/src/BlazorWebFormsComponents/BulletedList.razor.cs
+++ b/src/BlazorWebFormsComponents/BulletedList.razor.cs
@@ -86,17 +86,11 @@ public partial class BulletedList<TItem> : BaseListControl<TItem>
 };
 
 /// <summary>
-/// Gets the HTML type attribute value for ordered lists.
+/// Gets the start attribute value for ordered lists, or null when the default (1) is used.
+/// WebForms only renders the start attribute when FirstBulletNumber differs from 1.
 /// </summary>
-protected string OrderedListType => BulletStyle switch
-{
-BulletStyle.Numbered => "1",
-BulletStyle.LowerAlpha => "a",
-BulletStyle.UpperAlpha => "A",
-BulletStyle.LowerRoman => "i",
-BulletStyle.UpperRoman => "I",
-_ => null
-};
+protected int? GetStartAttribute() =>
+	IsOrderedList && FirstBulletNumber != 1 ? FirstBulletNumber : null;
 
 /// <summary>
 /// Gets the combined style string including list-style customization.
diff --git a/src/BlazorWebFormsComponents/GridView.razor.cs b/src/BlazorWebFormsComponents/GridView.razor.cs
index 9d27a610b..bf10aa768 100644
--- a/src/BlazorWebFormsComponents/GridView.razor.cs
+++ b/src/BlazorWebFormsComponents/GridView.razor.cs
@@ -226,8 +226,9 @@ public object SelectedValue
 
 		/// <summary>
 		/// Gets or sets whether header cells render with th scope="col" for accessibility.
+		/// WebForms defaults this to true.
 		/// </summary>
-		[Parameter] public bool UseAccessibleHeader { get; set; }
+		[Parameter] public bool UseAccessibleHeader { get; set; } = true;
 
 		/// <summary>
 		/// Gets or sets the cell padding for the table. -1 means the attribute is not rendered.
diff --git a/src/BlazorWebFormsComponents/LinkButton.razor b/src/BlazorWebFormsComponents/LinkButton.razor
index aa81239dd..965975015 100644
--- a/src/BlazorWebFormsComponents/LinkButton.razor
+++ b/src/BlazorWebFormsComponents/LinkButton.razor
@@ -12,6 +12,8 @@ else
 @code {
 	private string GetCssClassOrNull()
 	{
+		if (!Enabled)
+			return string.Concat(CssClass, " aspNetDisabled").Trim();
 		return !string.IsNullOrEmpty(CssClass) ? CssClass : null;
 	}
 }