diff --git a/Redot-Documentation-Tests/ClassDocumentationComponentTests.cs b/Redot-Documentation-Tests/ClassDocumentationComponentTests.cs
index de29268..479f1b6 100644
--- a/Redot-Documentation-Tests/ClassDocumentationComponentTests.cs
+++ b/Redot-Documentation-Tests/ClassDocumentationComponentTests.cs
@@ -161,6 +161,42 @@ await renderer.Dispatcher.InvokeAsync(async () =>
         Assert.Empty(renderer.Errors);
     }
 
+    [Fact]
+    public async Task ClassPage_RendersNavigationForSectionsAndOverloadedMembers()
+    {
+        await using var services = CreateServices();
+        var catalog = services.GetRequiredService<ClassDocumentationCatalog>();
+        var manager = services.GetRequiredService<VersionManagerService>();
+        var navigation = services.GetRequiredService<NavigationManager>();
+        navigation.NavigateTo("/en/26.1/Classes/Node?source=search");
+        var node = new ClassDocumentationEntry
+        {
+            Name = "Node",
+            Methods =
+            [
+                new ClassDocumentationCallable { Name = "add_child" },
+                new ClassDocumentationCallable { Name = "add_child" }
+            ]
+        };
+        catalog.Publish(new ClassDocumentationSnapshot(manager.LatestStableVersion, "1234567890abcdef",
+            DateTimeOffset.UtcNow, new Dictionary<string, ClassDocumentationEntry> { ["Node"] = node }));
+
+        await using var renderer = new TestRenderer(services);
+        int id = await renderer.Dispatcher.InvokeAsync(() => renderer.RenderAsync(typeof(ClassDocViewer),
+            ParameterView.FromDictionary(new Dictionary<string, object?>
+            { ["VersionSlug"] = "26.1", ["ClassName"] = "Node" })));
+
+        string rendered = await renderer.Dispatcher.InvokeAsync(() => renderer.Text(id));
+        string[] hrefs = await renderer.Dispatcher.InvokeAsync(() => renderer.Hrefs(id).ToArray());
+        Assert.Contains("desktop-toc", await renderer.Dispatcher.InvokeAsync(() => renderer.CssClasses(id).ToArray()));
+        Assert.Contains("mobile-toc", await renderer.Dispatcher.InvokeAsync(() => renderer.CssClasses(id).ToArray()));
+        Assert.Contains("<h3 id=\"method-add-child-2\">", rendered);
+        Assert.Contains("/en/26.1/Classes/Node?source=search#methods", hrefs);
+        Assert.Contains("/en/26.1/Classes/Node?source=search#method-add-child", hrefs);
+        Assert.Contains("/en/26.1/Classes/Node?source=search#method-add-child-2", hrefs);
+        Assert.Empty(renderer.Errors);
+    }
+
     [Theory]
     [InlineData(null)]
     [InlineData("Node")]
diff --git a/Redot-Documentation-Tests/ClassDocumentationRendererTests.cs b/Redot-Documentation-Tests/ClassDocumentationRendererTests.cs
index 769cb3d..6dc95b6 100644
--- a/Redot-Documentation-Tests/ClassDocumentationRendererTests.cs
+++ b/Redot-Documentation-Tests/ClassDocumentationRendererTests.cs
@@ -1,5 +1,7 @@
 using System.Text.RegularExpressions;
+using HtmlAgilityPack;
 using Redot_Documentation.ClassDocumentation;
+using Redot_Documentation.Components.Layout;
 using Redot_Documentation.Versioning;
 
 namespace Redot_Documentation_Tests;
@@ -39,7 +41,60 @@ public void RenderPage_RendersSignaturesStatusesAndStableAnchors()
         Assert.Contains("id=\"method-add-child\"", html);
         Assert.Contains("href=\"/en/latest/Classes/Object\"", html);
         Assert.Contains("class-status-experimental", html);
-        Assert.Contains("<code>Node</code></a> child", html);
+        Assert.Contains("<span class=\"token class-name\">Node</span></a> <span class=\"token variable\">child</span>", html);
+    }
+
+    [Fact]
+    public void RenderPage_HighlightsSignaturesAndCollectsMatchingMemberHeadings()
+    {
+        var renderer = new ClassDocumentationRenderer();
+        ClassDocumentationSnapshot snapshot = CreateSnapshot();
+        ClassDocumentationEntry node = snapshot.Classes["Node"] with
+        {
+            Description = "A useful class.",
+            Members = [new ClassDocumentationMember { Name = "enabled", Type = "bool", Default = "true" }],
+            Methods =
+            [
+                new ClassDocumentationCallable
+                {
+                    Name = "add_child", ReturnType = "void", Qualifiers = "virtual const",
+                    Parameters = [new ClassDocumentationParameter("child", "Node", "Node(1, 2)", null, false)]
+                },
+                new ClassDocumentationCallable
+                {
+                    Name = "add_child", ReturnType = "void",
+                    Parameters = [new ClassDocumentationParameter("unsafe", "String", "\"<script>\"", null, false)]
+                }
+            ],
+            Constants = [new ClassDocumentationConstant { Name = "MAX_COUNT", Value = "7" }]
+        };
+        var headings = new List<DocumentHeading>();
+
+        string html = renderer.RenderPage(node, snapshot, headings);
+        var document = new HtmlDocument();
+        document.LoadHtml(html);
+
+        Assert.Equal(
+            [
+                new(2, "description", "Description"),
+                new(2, "properties", "Properties"),
+                new(3, "member-enabled", "enabled"),
+                new(2, "methods", "Methods"),
+                new(3, "method-add-child", "add_child"),
+                new(3, "method-add-child-2", "add_child (overload 2)"),
+                new(2, "constants", "Constants"),
+                new(3, "constant-max-count", "MAX_COUNT")
+            ], headings);
+        Assert.Equal(headings.Select(heading => heading.Id),
+            document.DocumentNode.SelectNodes("//h2[@id]|//h3[@id]")!.Select(node => node.GetAttributeValue("id", "")));
+        Assert.Contains("<span class=\"token boolean\">true</span>", html);
+        Assert.Contains("<span class=\"token keyword\">virtual const</span>", html);
+        Assert.Contains("<span class=\"token function\">Node</span>", html);
+        Assert.Contains("<span class=\"token number\">7</span>", html);
+        Assert.Contains("href=\"/en/latest/Classes/Node\"><span class=\"token class-name\">Node</span></a>", html);
+        Assert.Contains("&lt;script&gt;", html);
+        Assert.DoesNotContain("<script>", html);
+        Assert.DoesNotContain("<code><a", html);
     }
 
     [Fact]
diff --git a/Redot-Documentation/ClassDocumentation/ClassDocumentationRenderer.cs b/Redot-Documentation/ClassDocumentation/ClassDocumentationRenderer.cs
index 25ce407..3f2636f 100644
--- a/Redot-Documentation/ClassDocumentation/ClassDocumentationRenderer.cs
+++ b/Redot-Documentation/ClassDocumentation/ClassDocumentationRenderer.cs
@@ -2,6 +2,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
+using Redot_Documentation.Components.Layout;
 
 namespace Redot_Documentation.ClassDocumentation;
 
@@ -53,15 +54,31 @@ public sealed class ClassDocumentationRenderer
         @"\[(?<class>@?[A-Za-z_][A-Za-z0-9_]*)\]",
         RegexOptions.Compiled);
 
+    private static readonly Regex SignatureValueRegex = new(
+        "(?<string>\"(?:\\\\.|[^\"\\\\])*\"|'(?:\\\\.|[^'\\\\])*')|" +
+        @"(?<number>(?<![\w.])(?:0x[0-9a-fA-F]+|\d+(?:\.\d+)?)(?![\w.]))|" +
+        @"(?<boolean>\b(?:true|false)\b)|(?<keyword>\bnull\b)|" +
+        @"(?<identifier>\b[A-Za-z_]\w*\b)|(?<operator>[-+*/%=<>!&|]+)|" +
+        @"(?<punctuation>[()\[\]{},.:])",
+        RegexOptions.Compiled);
+
+    private static readonly HashSet<string> BuiltInTypes = new(StringComparer.Ordinal)
+    {
+        "bool", "int", "float", "String", "StringName", "Variant", "void"
+    };
+
     /// <summary>Renders a complete class-reference page.</summary>
     /// <param name="entry">The class to render.</param>
     /// <param name="snapshot">The containing snapshot.</param>
+    /// <param name="tableOfContents">Receives headings and their existing fragment IDs when supplied.</param>
     /// <returns>The rendered HTML.</returns>
     public string RenderPage(
         ClassDocumentationEntry entry,
-        ClassDocumentationSnapshot snapshot)
+        ClassDocumentationSnapshot snapshot,
+        List<DocumentHeading>? tableOfContents = null)
     {
-        var context = new RenderContext();
+        tableOfContents?.Clear();
+        var context = new RenderContext(tableOfContents);
         var html = new StringBuilder();
         html.Append("<article class=\"class-reference\">");
         html.Append("<header class=\"class-reference-header\"><p class=\"class-reference-kicker\">Class reference</p><h1>")
@@ -90,7 +107,7 @@ public string RenderPage(
         AppendCallables(html, "Operators", "operators", "operator", entry.Operators, entry, snapshot, context);
         AppendCallables(html, "Annotations", "annotations", "annotation", entry.Annotations, entry, snapshot, context);
         AppendThemeItems(html, entry, snapshot, context);
-        AppendTutorials(html, entry.Tutorials, snapshot.Version.Slug);
+        AppendTutorials(html, entry.Tutorials, snapshot.Version.Slug, context);
 
         html.Append("<footer class=\"class-reference-source\">Source revision <code>")
             .Append(Encode(ShortCommit(snapshot.CommitSha)))
@@ -215,6 +232,7 @@ private void AppendDescriptionSection(
     {
         if (string.IsNullOrWhiteSpace(description))
             return;
+        context.AddHeading(2, id, title);
         html.Append("<section><h2 id=\"").Append(id).Append("\">").Append(title).Append("</h2>")
             .Append(RenderMarkup(description, entry, snapshot, context)).Append("</section>");
     }
@@ -232,14 +250,24 @@ private void AppendMembers(
     {
         if (entry.Members.Count == 0)
             return;
+        context.AddHeading(2, "properties", "Properties");
         html.Append("<section><h2 id=\"properties\">Properties</h2><div class=\"class-api-list\">");
         foreach (ClassDocumentationMember member in entry.Members)
         {
+            string anchor = MemberAnchor("member", member.Name);
+            context.AddHeading(3, anchor, member.Name);
             html.Append("<article class=\"class-api-item\"><h3 id=\"")
-                .Append(MemberAnchor("member", member.Name)).Append("\"><code>")
-                .Append(RenderType(member.Type, snapshot)).Append(' ').Append(Encode(member.Name));
+                .Append(anchor).Append("\"><code>");
+            AppendSignatureType(html, member.Type, snapshot);
+            html.Append(' ');
+            AppendToken(html, "property", member.Name);
             if (!string.IsNullOrWhiteSpace(member.Default))
-                html.Append(" = ").Append(Encode(member.Default));
+            {
+                html.Append(' ');
+                AppendToken(html, "operator", "=");
+                html.Append(' ');
+                AppendSignatureValue(html, member.Default);
+            }
             html.Append("</code></h3>");
             AppendStatus(html, "Deprecated", member.Deprecated, "deprecated", entry, snapshot, context);
             AppendStatus(html, "Experimental", member.Experimental, "experimental", entry, snapshot, context);
@@ -269,6 +297,7 @@ private void AppendCallables(
     {
         if (callables.Count == 0)
             return;
+        context.AddHeading(2, sectionId, title);
         html.Append("<section><h2 id=\"").Append(sectionId).Append("\">").Append(title)
             .Append("</h2><div class=\"class-api-list\">");
         var anchorCounts = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
@@ -278,21 +307,37 @@ private void AppendCallables(
             anchorCounts.TryGetValue(baseAnchor, out int anchorCount);
             anchorCounts[baseAnchor] = ++anchorCount;
             string anchor = anchorCount == 1 ? baseAnchor : $"{baseAnchor}-{anchorCount}";
-            html.Append("<article class=\"class-api-item\"><h3 id=\"").Append(anchor).Append("\"><code>")
-                .Append(RenderType(callable.ReturnType, snapshot)).Append(' ')
-                .Append(Encode(callable.Name)).Append('(');
+            context.AddHeading(3, anchor, anchorCount == 1 ? callable.Name : $"{callable.Name} (overload {anchorCount})");
+            html.Append("<article class=\"class-api-item\"><h3 id=\"").Append(anchor).Append("\"><code>");
+            AppendSignatureType(html, callable.ReturnType, snapshot);
+            html.Append(' ');
+            AppendToken(html, "function", callable.Name);
+            AppendToken(html, "punctuation", "(");
             for (int index = 0; index < callable.Parameters.Count; index++)
             {
                 if (index > 0)
-                    html.Append(", ");
+                {
+                    AppendToken(html, "punctuation", ",");
+                    html.Append(' ');
+                }
                 ClassDocumentationParameter parameter = callable.Parameters[index];
-                html.Append(RenderType(parameter.Type, snapshot)).Append(' ').Append(Encode(parameter.Name));
+                AppendSignatureType(html, parameter.Type, snapshot);
+                html.Append(' ');
+                AppendToken(html, "variable", parameter.Name);
                 if (!string.IsNullOrWhiteSpace(parameter.Default))
-                    html.Append(" = ").Append(Encode(parameter.Default));
+                {
+                    html.Append(' ');
+                    AppendToken(html, "operator", "=");
+                    html.Append(' ');
+                    AppendSignatureValue(html, parameter.Default);
+                }
             }
-            html.Append(')');
+            AppendToken(html, "punctuation", ")");
             if (!string.IsNullOrWhiteSpace(callable.Qualifiers))
-                html.Append(' ').Append(Encode(callable.Qualifiers));
+            {
+                html.Append(' ');
+                AppendToken(html, "keyword", callable.Qualifiers);
+            }
             html.Append("</code></h3>");
             AppendStatus(html, "Deprecated", callable.Deprecated, "deprecated", entry, snapshot, context);
             AppendStatus(html, "Experimental", callable.Experimental, "experimental", entry, snapshot, context);
@@ -314,19 +359,30 @@ private void AppendSignals(
     {
         if (entry.Signals.Count == 0)
             return;
+        context.AddHeading(2, "signals", "Signals");
         html.Append("<section><h2 id=\"signals\">Signals</h2><div class=\"class-api-list\">");
         foreach (ClassDocumentationSignal signal in entry.Signals)
         {
-            html.Append("<article class=\"class-api-item\"><h3 id=\"").Append(MemberAnchor("signal", signal.Name))
-                .Append("\"><code>").Append(Encode(signal.Name)).Append('(');
+            string anchor = MemberAnchor("signal", signal.Name);
+            context.AddHeading(3, anchor, signal.Name);
+            html.Append("<article class=\"class-api-item\"><h3 id=\"").Append(anchor)
+                .Append("\"><code>");
+            AppendToken(html, "function", signal.Name);
+            AppendToken(html, "punctuation", "(");
             for (int index = 0; index < signal.Parameters.Count; index++)
             {
                 if (index > 0)
-                    html.Append(", ");
+                {
+                    AppendToken(html, "punctuation", ",");
+                    html.Append(' ');
+                }
                 ClassDocumentationParameter parameter = signal.Parameters[index];
-                html.Append(RenderType(parameter.Type, snapshot)).Append(' ').Append(Encode(parameter.Name));
+                AppendSignatureType(html, parameter.Type, snapshot);
+                html.Append(' ');
+                AppendToken(html, "variable", parameter.Name);
             }
-            html.Append(")</code></h3>");
+            AppendToken(html, "punctuation", ")");
+            html.Append("</code></h3>");
             AppendStatus(html, "Deprecated", signal.Deprecated, "deprecated", entry, snapshot, context);
             AppendStatus(html, "Experimental", signal.Experimental, "experimental", entry, snapshot, context);
             html.Append(RenderMarkup(signal.Description, entry, snapshot, context)).Append("</article>");
@@ -347,12 +403,20 @@ private void AppendConstants(
     {
         if (entry.Constants.Count == 0)
             return;
+        context.AddHeading(2, "constants", "Constants");
         html.Append("<section><h2 id=\"constants\">Constants</h2><div class=\"class-api-list\">");
         foreach (ClassDocumentationConstant constant in entry.Constants)
         {
-            html.Append("<article class=\"class-api-item\"><h3 id=\"").Append(MemberAnchor("constant", constant.Name))
-                .Append("\"><code>").Append(Encode(constant.Name)).Append(" = ").Append(Encode(constant.Value))
-                .Append("</code></h3>");
+            string anchor = MemberAnchor("constant", constant.Name);
+            context.AddHeading(3, anchor, constant.Name);
+            html.Append("<article class=\"class-api-item\"><h3 id=\"").Append(anchor)
+                .Append("\"><code>");
+            AppendToken(html, "constant", constant.Name);
+            html.Append(' ');
+            AppendToken(html, "operator", "=");
+            html.Append(' ');
+            AppendSignatureValue(html, constant.Value);
+            html.Append("</code></h3>");
             if (!string.IsNullOrWhiteSpace(constant.Enum))
                 html.Append("<p class=\"class-api-meta\">Enum: ").Append(Encode(constant.Enum)).Append("</p>");
             AppendStatus(html, "Deprecated", constant.Deprecated, "deprecated", entry, snapshot, context);
@@ -375,13 +439,24 @@ private void AppendThemeItems(
     {
         if (entry.ThemeItems.Count == 0)
             return;
+        context.AddHeading(2, "theme-items", "Theme properties");
         html.Append("<section><h2 id=\"theme-items\">Theme properties</h2><div class=\"class-api-list\">");
         foreach (ClassDocumentationThemeItem item in entry.ThemeItems)
         {
-            html.Append("<article class=\"class-api-item\"><h3 id=\"").Append(MemberAnchor("theme-item", item.Name))
-                .Append("\"><code>").Append(RenderType(item.Type, snapshot)).Append(' ').Append(Encode(item.Name));
+            string anchor = MemberAnchor("theme-item", item.Name);
+            context.AddHeading(3, anchor, item.Name);
+            html.Append("<article class=\"class-api-item\"><h3 id=\"").Append(anchor)
+                .Append("\"><code>");
+            AppendSignatureType(html, item.Type, snapshot);
+            html.Append(' ');
+            AppendToken(html, "property", item.Name);
             if (!string.IsNullOrWhiteSpace(item.Default))
-                html.Append(" = ").Append(Encode(item.Default));
+            {
+                html.Append(' ');
+                AppendToken(html, "operator", "=");
+                html.Append(' ');
+                AppendSignatureValue(html, item.Default);
+            }
             html.Append("</code></h3>").Append(RenderMarkup(item.Description, entry, snapshot, context)).Append("</article>");
         }
         html.Append("</div></section>");
@@ -394,10 +469,12 @@ private void AppendThemeItems(
     private static void AppendTutorials(
         StringBuilder html,
         IReadOnlyList<ClassDocumentationTutorial> tutorials,
-        string versionSlug)
+        string versionSlug,
+        RenderContext context)
     {
         if (tutorials.Count == 0)
             return;
+        context.AddHeading(2, "tutorials", "Tutorials");
         html.Append("<section><h2 id=\"tutorials\">Tutorials</h2><ul class=\"class-tutorials\">");
         foreach (ClassDocumentationTutorial tutorial in tutorials)
         {
@@ -592,14 +669,43 @@ private static string StorePlaceholder(
         return placeholder;
     }
 
-    /// <summary>Renders a type name, linking known classes.</summary>
-    /// <param name="type">The type name.</param>
-    /// <param name="snapshot">The containing snapshot.</param>
-    /// <returns>The rendered type.</returns>
-    private static string RenderType(string type, ClassDocumentationSnapshot snapshot)
-        => snapshot.Classes.ContainsKey(type)
-            ? RenderClassLink(type, snapshot.Version.Slug)
-            : Encode(type);
+    /// <summary>Adds a highlighted type while preserving links to documented classes.</summary>
+    private static void AppendSignatureType(StringBuilder html, string type, ClassDocumentationSnapshot snapshot)
+    {
+        if (snapshot.Classes.ContainsKey(type))
+        {
+            html.Append("<a href=\"").Append(Encode(ClassPath(snapshot.Version.Slug, type))).Append("\">");
+            AppendToken(html, "class-name", type);
+            html.Append("</a>");
+            return;
+        }
+
+        AppendToken(html, type == "void" ? "keyword" : BuiltInTypes.Contains(type) ? "builtin" : "class-name", type);
+    }
+
+    /// <summary>Adds highlighted literal and expression tokens from an XML signature value.</summary>
+    private static void AppendSignatureValue(StringBuilder html, string value)
+    {
+        int position = 0;
+        foreach (Match match in SignatureValueRegex.Matches(value))
+        {
+            html.Append(Encode(value[position..match.Index]));
+            string tokenType = match.Groups["string"].Success ? "string"
+                : match.Groups["number"].Success ? "number"
+                : match.Groups["boolean"].Success ? "boolean"
+                : match.Groups["keyword"].Success ? "keyword"
+                : match.Groups["operator"].Success ? "operator"
+                : match.Groups["punctuation"].Success ? "punctuation"
+                : value[(match.Index + match.Length)..].TrimStart().StartsWith('(') ? "function" : "constant";
+            AppendToken(html, tokenType, match.Value);
+            position = match.Index + match.Length;
+        }
+        html.Append(Encode(value[position..]));
+    }
+
+    private static void AppendToken(StringBuilder html, string tokenType, string value)
+        => html.Append("<span class=\"token ").Append(tokenType).Append("\">")
+            .Append(Encode(value)).Append("</span>");
 
     /// <summary>Renders a class link.</summary>
     /// <param name="className">The class name.</param>
@@ -637,7 +743,7 @@ private static string ShortCommit(string commitSha)
         => commitSha.Length > 12 ? commitSha[..12] : commitSha;
 
     /// <summary>Tracks identifiers within one rendered output.</summary>
-    private sealed class RenderContext
+    private sealed class RenderContext(List<DocumentHeading>? headings = null)
     {
         /// <summary>Stores the next tab-group index.</summary>
         private int _nextTabGroupIndex;
@@ -645,5 +751,8 @@ private sealed class RenderContext
         /// <summary>Gets and advances the next tab-group index.</summary>
         /// <returns>The next unique index.</returns>
         public int NextTabGroupIndex() => _nextTabGroupIndex++;
+
+        public void AddHeading(int level, string id, string title)
+            => headings?.Add(new DocumentHeading(level, id, title));
     }
 }
diff --git a/Redot-Documentation/Components/Pages/ClassDocViewer.razor b/Redot-Documentation/Components/Pages/ClassDocViewer.razor
index ec8ebcf..4a92d79 100644
--- a/Redot-Documentation/Components/Pages/ClassDocViewer.razor
+++ b/Redot-Documentation/Components/Pages/ClassDocViewer.razor
@@ -2,9 +2,11 @@
 @page "/en/{VersionSlug}/Classes/{ClassName}"
 @layout MainLayout
 @using Redot_Documentation.ClassDocumentation
+@using Redot_Documentation.Components.Layout
 @implements IDisposable
 @inject ClassDocumentationCatalog Catalog
 @inject ClassDocumentationRenderer Renderer
+@inject NavigationManager Navigation
 @inject IJSRuntime JS
 
 <PageTitle>@PageTitleText</PageTitle>
@@ -26,9 +28,21 @@ else if (!string.IsNullOrWhiteSpace(ClassName))
     }
     else
     {
-        <div class="doc-viewer-content class-doc-viewer">
-            @((MarkupString)Renderer.RenderPage(_classDocumentation, _snapshot))
-            <DocumentationAttribution ClassReference="true" />
+        <div class="doc-viewer-layout class-doc-layout">
+            <article class="doc-viewer-content class-doc-viewer">
+                @if (_tableOfContents.Count > 0)
+                {
+                    <MudExpansionPanels Class="mobile-toc" Elevation="0" Outlined="true">
+                        <MudExpansionPanel Text="On this page"><DocumentToc Items="_tableOfContents" BuildHref="BuildTableOfContentsHref" /></MudExpansionPanel>
+                    </MudExpansionPanels>
+                }
+                @((MarkupString)_renderedHtml)
+                <DocumentationAttribution ClassReference="true" />
+            </article>
+            @if (_tableOfContents.Count > 0)
+            {
+                <div class="desktop-toc"><DocumentToc Items="_tableOfContents" BuildHref="BuildTableOfContentsHref" /></div>
+            }
         </div>
     }
 }
@@ -83,6 +97,8 @@ else
 
     private ClassDocumentationSnapshot? _snapshot;
     private ClassDocumentationEntry? _classDocumentation;
+    private string _renderedHtml = string.Empty;
+    private readonly List<DocumentHeading> _tableOfContents = [];
     private string _searchText = string.Empty;
     private bool _disposed;
 
@@ -107,11 +123,18 @@ else
     private void LoadSnapshot()
     {
         _classDocumentation = null;
+        _renderedHtml = string.Empty;
+        _tableOfContents.Clear();
         Catalog.TryGetSnapshot(VersionSlug, out _snapshot);
         if (_snapshot is not null && !string.IsNullOrWhiteSpace(ClassName))
             _snapshot.TryGetClass(ClassName, out _classDocumentation);
+        if (_classDocumentation is not null && _snapshot is not null)
+            _renderedHtml = Renderer.RenderPage(_classDocumentation, _snapshot, _tableOfContents);
     }
 
+    private string BuildTableOfContentsHref(string id)
+        => $"{ClassDocumentationRenderer.ClassPath(VersionSlug, _classDocumentation!.Name)}{new Uri(Navigation.Uri).Query}#{Uri.EscapeDataString(id)}";
+
     private void OnCatalogChanged(string versionSlug)
     {
         _ = InvokeAsync(() =>
diff --git a/Redot-Documentation/wwwroot/app.css b/Redot-Documentation/wwwroot/app.css
index add858e..45c4dec 100644
--- a/Redot-Documentation/wwwroot/app.css
+++ b/Redot-Documentation/wwwroot/app.css
@@ -36,6 +36,7 @@ button, a { -webkit-tap-highlight-color: transparent; }
 .landing-container { flex: 1; min-width: 0; }
 .landing-container > .doc-viewer-content { padding: 48px 24px; }
 .doc-viewer-layout { display: grid; grid-template-columns: minmax(0, 1fr) 220px; gap: clamp(24px, 4vw, 64px); max-width: 1260px; margin-inline: auto; align-items: start; }
+.class-doc-layout { max-width: none; grid-template-columns: minmax(0, 1fr) 240px; gap: clamp(28px, 3vw, 56px); }
 .doc-viewer-layout:not(:has(.doc-viewer-toc)) { grid-template-columns: minmax(0, 1fr); }
 .doc-viewer-content { min-width: 0; width: 100%; max-width: 80ch; margin-inline: auto; font-size: 1rem; line-height: 1.75; overflow-wrap: break-word; }
 .doc-viewer-content h1 { font-size: clamp(2rem, 3vw, 2.75rem); line-height: 1.15; font-weight: 750; letter-spacing: -.035em; margin: .2rem 0 1.75rem; }
@@ -64,7 +65,7 @@ button, a { -webkit-tap-highlight-color: transparent; }
 .doc-viewer-toc li { margin: 0 0 12px; line-height: 1.5; }
 .doc-viewer-toc .toc-level-2 { padding-left: 10px; }
 .doc-viewer-toc .toc-level-3 { padding-left: 20px; }
-.doc-viewer-toc a { color: var(--redot-muted); text-decoration: none; }
+.doc-viewer-toc a { color: var(--redot-muted); text-decoration: none; overflow-wrap: anywhere; }
 .doc-viewer-toc a:hover { color: #ff967c; }
 .mobile-toc { display: none; }
 .doc-tabs { margin: 1.5rem 0; border: 1px solid var(--redot-border); border-radius: 10px; overflow: hidden; background: #121216; }
@@ -133,9 +134,10 @@ button, a { -webkit-tap-highlight-color: transparent; }
 .lookup-preview img { display: block; width: 100%; }
 .lookup-actions { display: flex; flex-wrap: wrap; gap: 10px; margin-top: 24px; }
 .lookup-actions .mud-button { font-size: .75rem; padding: 10px 14px; }
-.class-doc-viewer, .class-index { max-width: 1000px; }
+.class-doc-viewer { max-width: 1100px; }
+.class-index { max-width: 1000px; }
 .class-search-field { max-width: 36rem; margin: 20px 0 32px; }
-@media (max-width: 1250px) { .doc-viewer-layout { grid-template-columns: minmax(0,1fr); } .desktop-toc { display: none; } .mobile-toc { display: block; margin-bottom: 24px; } .mobile-toc .doc-viewer-toc { position: static; max-height: 320px; border: 0; padding: 0; } }
+@media (max-width: 1250px) { .doc-viewer-layout, .class-doc-layout { grid-template-columns: minmax(0,1fr); } .desktop-toc { display: none; } .mobile-toc { display: block; margin-bottom: 24px; } .mobile-toc .doc-viewer-toc { position: static; max-height: 320px; border: 0; padding: 0; } }
 @media (max-width: 959px) { .header-links { gap: 12px; } .hero-preview { transform: none; } .topic-band { grid-template-columns: 1fr; gap: 20px; } .article-container { padding: 24px 20px 40px; } .footer-inner nav { margin-left: 0; } }
 @media (max-width: 599px) { .docs-appbar .mud-toolbar { gap: 8px; padding-inline: 12px; } .header-links { display: none; } .docs-brand { font-size: 1.05rem; gap: 8px; } .brand-icon { width: 28px; height: 28px; } .section-heading { display: block; } .home-hero { padding: 40px 0; } .home-sections { padding-top: 36px; } .topic-grid { grid-template-columns: repeat(2,minmax(0,1fr)); } .topic-band { margin-top: 32px; } .home-actions .mud-button { flex-grow: 1; } .lookup-section { padding-top: 40px; } }
 @media (prefers-reduced-motion: reduce) { *, *::before, *::after { scroll-behavior: auto !important; transition-duration: 0s !important; animation-duration: 0s !important; } }
@@ -167,22 +169,35 @@ button, a { -webkit-tap-highlight-color: transparent; }
 
 .class-api-list {
     display: grid;
+    grid-template-columns: minmax(0, 1fr);
     gap: 1rem;
 }
 
 .class-api-item {
+    min-width: 0;
     background: var(--app-panel);
     border: 1px solid #333;
     border-radius: 6px;
     padding: 0 1rem 0.75rem;
 }
 
-.class-api-item h3 {
-    font-size: 1rem;
-    margin: 1rem 0;
+.doc-viewer-content .class-api-item h3 {
+    font-size: 1.25rem;
+    font-weight: 700;
+    line-height: 1.45;
+    margin: 1.1rem 0 .9rem;
     overflow-wrap: anywhere;
 }
 
+.doc-viewer-content .class-api-item h3 > code {
+    color: inherit;
+    background: none;
+    padding: 0;
+    font-size: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+}
+
 .class-status {
     border-left: 4px solid #d19a40;
     margin: 0.75rem 0;