diff --git a/docs/_docset.yml b/docs/_docset.yml
index 5a6c83126..9434bb0f6 100644
--- a/docs/_docset.yml
+++ b/docs/_docset.yml
@@ -9,10 +9,6 @@ subs:
   serverless-short: Serverless
   ece:   "Elastic Cloud Enterprise"
   eck:   "Elastic Cloud on Kubernetes"
-  
-features:
-  primary-nav: false
-
 toc:
   - file: index.md
   - hidden: developer-notes.md
diff --git a/src/Elastic.Markdown/Assets/pages-nav.ts b/src/Elastic.Markdown/Assets/pages-nav.ts
index a5864cde0..ba8b8ff21 100644
--- a/src/Elastic.Markdown/Assets/pages-nav.ts
+++ b/src/Elastic.Markdown/Assets/pages-nav.ts
@@ -15,9 +15,9 @@ function scrollCurrentNaviItemIntoView(nav: HTMLElement, delay: number) {
 	const currentNavItem = $('.current', nav);
 	expandAllParents(currentNavItem);
 	setTimeout(() => {
+
 		if (currentNavItem && !isElementInViewport(currentNavItem)) {
 			currentNavItem.scrollIntoView({ behavior: 'smooth', block: 'center' });
-			window.scrollTo(0, 0);
 		}
 	}, delay);
 }
@@ -36,7 +36,7 @@ export function initNav() {
 	if (!pagesNav) {
 		return;
 	}
-	const navItems = $$('a[href="' + window.location.pathname + '"], a[href="' + window.location.pathname + '/"]', pagesNav);
+	const navItems = $$('a[href="' + window.location.pathname + '"]', pagesNav);
 	navItems.forEach(el => {
 		el.classList.add('current');
 	});
diff --git a/src/Elastic.Markdown/Assets/styles.css b/src/Elastic.Markdown/Assets/styles.css
index 472d55bd4..112eddee4 100644
--- a/src/Elastic.Markdown/Assets/styles.css
+++ b/src/Elastic.Markdown/Assets/styles.css
@@ -72,9 +72,8 @@
 	
 	.sidebar {
 		.sidebar-nav {
-			@apply sticky top-21 z-30 overflow-y-auto;
+			@apply sticky top-22 z-30 overflow-y-auto;
 			max-height: calc(100vh - var(--spacing) * 22);
-			scrollbar-gutter: stable;
 		}
 		
 		.sidebar-link {
@@ -82,9 +81,7 @@
 				text-ink-light
 				hover:text-black
 				text-sm
-				text-wrap
-				inline-block
-			    leading-[1.3em]
+			    leading-[1.2em]
 			    tracking-[-0.02em];
 		}
 	}
@@ -172,7 +169,7 @@
 }
 
 #pages-nav .current {
-	@apply font-semibold text-blue-elastic!;
+	@apply text-blue-elastic!;
 }
 
 .markdown-content {
diff --git a/src/Elastic.Markdown/Helpers/Htmx.cs b/src/Elastic.Markdown/Helpers/Htmx.cs
index 9e6422fb1..050af241e 100644
--- a/src/Elastic.Markdown/Helpers/Htmx.cs
+++ b/src/Elastic.Markdown/Helpers/Htmx.cs
@@ -2,50 +2,9 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Text;
-using Elastic.Markdown.IO.Configuration;
-
 namespace Elastic.Markdown.Helpers;
 
-public static class Htmx
+public class Htmx
 {
-	public static string GetHxSelectOob(FeatureFlags features, string? pathPrefix, string currentUrl, string targetUrl)
-	{
-		HashSet<string> selectTargets =
-		[
-			"#primary-nav", "#secondary-nav", "#markdown-content", "#toc-nav", "#prev-next-nav", "#breadcrumbs"
-		];
-		if (!HasSameTopLevelGroup(pathPrefix, currentUrl, targetUrl) && features.IsPrimaryNavEnabled)
-			_ = selectTargets.Add("#pages-nav");
-		return string.Join(',', selectTargets);
-	}
-
-	public static bool HasSameTopLevelGroup(string? pathPrefix, string currentUrl, string targetUrl)
-	{
-		var startIndex = pathPrefix?.Length ?? 0;
-		var currentSegments = GetSegments(currentUrl[startIndex..].Trim('/'));
-		var targetSegments = GetSegments(targetUrl[startIndex..].Trim('/'));
-		return currentSegments.Length >= 1 && targetSegments.Length >= 1 && currentSegments[0] == targetSegments[0];
-	}
-
-	public static string GetPreload() => "true";
-
-	public static string GetHxSwap() => "none";
-	public static string GetHxPushUrl() => "true";
-	public static string GetHxIndicator() => "#htmx-indicator";
-
-	private static string[] GetSegments(string url) => url.Split('/');
-
-	public static string GetHxAttributes(FeatureFlags features, string? pathPrefix, string currentUrl, string targetUrl)
-	{
-
-		var attributes = new StringBuilder();
-		_ = attributes.Append($" hx-get={targetUrl}");
-		_ = attributes.Append($" hx-select-oob={GetHxSelectOob(features, pathPrefix, currentUrl, targetUrl)}");
-		_ = attributes.Append($" hx-swap={GetHxSwap()}");
-		_ = attributes.Append($" hx-push-url={GetHxPushUrl()}");
-		_ = attributes.Append($" hx-indicator={GetHxIndicator()}");
-		_ = attributes.Append($" preload={GetPreload()}");
-		return attributes.ToString();
-	}
+	public static string GetHxSelectOob() => "#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs";
 }
diff --git a/src/Elastic.Markdown/IO/Configuration/ConfigurationFile.cs b/src/Elastic.Markdown/IO/Configuration/ConfigurationFile.cs
index 97e0afe36..081252678 100644
--- a/src/Elastic.Markdown/IO/Configuration/ConfigurationFile.cs
+++ b/src/Elastic.Markdown/IO/Configuration/ConfigurationFile.cs
@@ -31,10 +31,6 @@ public record ConfigurationFile : DocumentationFile
 	private readonly Dictionary<string, string> _substitutions = new(StringComparer.OrdinalIgnoreCase);
 	public IReadOnlyDictionary<string, string> Substitutions => _substitutions;
 
-	private readonly Dictionary<string, bool> _features = new(StringComparer.OrdinalIgnoreCase);
-	private FeatureFlags? _featureFlags;
-	public FeatureFlags Features => _featureFlags ??= new FeatureFlags(_features);
-
 	public ConfigurationFile(IFileInfo sourceFile, IDirectoryInfo rootPath, BuildContext context, int depth = 0, string parentPath = "")
 		: base(sourceFile, rootPath)
 	{
@@ -83,9 +79,6 @@ public ConfigurationFile(IFileInfo sourceFile, IDirectoryInfo rootPath, BuildCon
 
 						TableOfContents = entries;
 						break;
-					case "features":
-						_features = reader.ReadDictionary(entry.Entry).ToDictionary(k => k.Key, v => bool.Parse(v.Value), StringComparer.OrdinalIgnoreCase);
-						break;
 					case "external_hosts":
 						reader.EmitWarning($"{entry.Key} has been deprecated and will be removed", entry.Key);
 						break;
@@ -104,8 +97,6 @@ public ConfigurationFile(IFileInfo sourceFile, IDirectoryInfo rootPath, BuildCon
 		Globs = [.. ImplicitFolders.Select(f => Glob.Parse($"{f}/*.md"))];
 	}
 
-	public bool IsFeatureEnabled(string feature) => _features.TryGetValue(feature, out var enabled) && enabled;
-
 	private List<ITocItem> ReadChildren(YamlStreamReader reader, KeyValuePair<YamlNode, YamlNode> entry, string parentPath)
 	{
 		var entries = new List<ITocItem>();
diff --git a/src/Elastic.Markdown/IO/Configuration/FeatureFlags.cs b/src/Elastic.Markdown/IO/Configuration/FeatureFlags.cs
deleted file mode 100644
index 57055de93..000000000
--- a/src/Elastic.Markdown/IO/Configuration/FeatureFlags.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-namespace Elastic.Markdown.IO.Configuration;
-
-public class FeatureFlags(Dictionary<string, bool> featureFlags)
-{
-	public bool IsPrimaryNavEnabled => IsEnabled("primary-nav");
-	private bool IsEnabled(string key) => featureFlags.TryGetValue(key, out var value) && value;
-}
diff --git a/src/Elastic.Markdown/IO/MarkdownFile.cs b/src/Elastic.Markdown/IO/MarkdownFile.cs
index e99acc238..94c57e716 100644
--- a/src/Elastic.Markdown/IO/MarkdownFile.cs
+++ b/src/Elastic.Markdown/IO/MarkdownFile.cs
@@ -316,7 +316,7 @@ private YamlFrontMatter ReadYamlFrontMatter(string raw)
 	}
 
 
-	public string CreateHtml(MarkdownDocument document)
+	public static string CreateHtml(MarkdownDocument document)
 	{
 		//we manually render title and optionally append an applies block embedded in yaml front matter.
 		var h1 = document.Descendants<HeadingBlock>().FirstOrDefault(h => h.Level == 1);
@@ -324,13 +324,4 @@ public string CreateHtml(MarkdownDocument document)
 			_ = document.Remove(h1);
 		return document.ToHtml(MarkdownParser.Pipeline);
 	}
-
-	public static string CreateHtml(MarkdownDocument document, MarkdownParser parser)
-	{
-		//we manually render title and optionally append an applies block embedded in yaml front matter.
-		var h1 = document.Descendants<HeadingBlock>().FirstOrDefault(h => h.Level == 1);
-		if (h1 is not null)
-			_ = document.Remove(h1);
-		return document.ToHtml(parser.Pipeline);
-	}
 }
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
index 1453980d2..89b18c96a 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveHtmlRenderer.cs
@@ -21,7 +21,7 @@ namespace Elastic.Markdown.Myst.Directives;
 /// An HTML renderer for a <see cref="DirectiveBlock"/>.
 /// </summary>
 /// <seealso cref="HtmlObjectRenderer{CustomContainer}" />
-public class DirectiveHtmlRenderer(MarkdownParser markdownParser) : HtmlObjectRenderer<DirectiveBlock>
+public class DirectiveHtmlRenderer : HtmlObjectRenderer<DirectiveBlock>
 {
 	protected override void Write(HtmlRenderer renderer, DirectiveBlock directiveBlock)
 	{
@@ -62,10 +62,10 @@ protected override void Write(HtmlRenderer renderer, DirectiveBlock directiveBlo
 				if (includeBlock.Literal)
 					WriteLiteralIncludeBlock(renderer, includeBlock);
 				else
-					WriteIncludeBlock(renderer, includeBlock, markdownParser);
+					WriteIncludeBlock(renderer, includeBlock);
 				return;
 			case SettingsBlock settingsBlock:
-				WriteSettingsBlock(renderer, settingsBlock, markdownParser);
+				WriteSettingsBlock(renderer, settingsBlock);
 				return;
 			default:
 				// if (!string.IsNullOrEmpty(directiveBlock.Info) && !directiveBlock.Info.StartsWith('{'))
@@ -219,24 +219,28 @@ private static void WriteLiteralIncludeBlock(HtmlRenderer renderer, IncludeBlock
 		}
 	}
 
-	private static void WriteIncludeBlock(HtmlRenderer renderer, IncludeBlock block, MarkdownParser parser)
+	private static void WriteIncludeBlock(HtmlRenderer renderer, IncludeBlock block)
 	{
 		if (!block.Found || block.IncludePath is null)
 			return;
 
+		var parser = new MarkdownParser(block.Build, block.Context);
 		var snippet = block.Build.ReadFileSystem.FileInfo.New(block.IncludePath);
 		var parentPath = block.Context.MarkdownSourcePath;
 		var document = parser.ParseSnippetAsync(snippet, parentPath, block.Context.YamlFrontMatter, default).GetAwaiter().GetResult();
-		var html = document.ToHtml(parser.Pipeline);
+		var html = document.ToHtml(MarkdownParser.Pipeline);
 		_ = renderer.Write(html);
 	}
 
-	private static void WriteSettingsBlock(HtmlRenderer renderer, SettingsBlock block, MarkdownParser parser)
+	private static void WriteSettingsBlock(HtmlRenderer renderer, SettingsBlock block)
 	{
 		if (!block.Found || block.IncludePath is null)
 			return;
 
+		var parser = new MarkdownParser(block.Build, block.Context);
+
 		var file = block.Build.ReadFileSystem.FileInfo.New(block.IncludePath);
+
 		YamlSettings? settings;
 		try
 		{
@@ -260,7 +264,7 @@ private static void WriteSettingsBlock(HtmlRenderer renderer, SettingsBlock bloc
 			RenderMarkdown = s =>
 			{
 				var document = parser.ParseEmbeddedMarkdown(s, block.IncludeFrom, block.Context.YamlFrontMatter);
-				var html = document.ToHtml(parser.Pipeline);
+				var html = document.ToHtml(MarkdownParser.Pipeline);
 				return html;
 			}
 		});
diff --git a/src/Elastic.Markdown/Myst/Directives/DirectiveMarkdownExtension.cs b/src/Elastic.Markdown/Myst/Directives/DirectiveMarkdownExtension.cs
index c4246baa6..4f990e3b8 100644
--- a/src/Elastic.Markdown/Myst/Directives/DirectiveMarkdownExtension.cs
+++ b/src/Elastic.Markdown/Myst/Directives/DirectiveMarkdownExtension.cs
@@ -13,9 +13,9 @@ namespace Elastic.Markdown.Myst.Directives;
 
 public static class DirectiveMarkdownBuilderExtensions
 {
-	public static MarkdownPipelineBuilder UseDirectives(this MarkdownPipelineBuilder pipeline, MarkdownParser markdownParser)
+	public static MarkdownPipelineBuilder UseDirectives(this MarkdownPipelineBuilder pipeline)
 	{
-		pipeline.Extensions.AddIfNotAlready(new DirectiveMarkdownExtension(markdownParser));
+		pipeline.Extensions.AddIfNotAlready<DirectiveMarkdownExtension>();
 		return pipeline;
 	}
 }
@@ -24,7 +24,7 @@ public static MarkdownPipelineBuilder UseDirectives(this MarkdownPipelineBuilder
 /// Extension to allow custom containers.
 /// </summary>
 /// <seealso cref="IMarkdownExtension" />
-public class DirectiveMarkdownExtension(MarkdownParser markdownParser) : IMarkdownExtension
+public class DirectiveMarkdownExtension : IMarkdownExtension
 {
 	public void Setup(MarkdownPipelineBuilder pipeline)
 	{
@@ -53,7 +53,7 @@ public void Setup(MarkdownPipeline pipeline, IMarkdownRenderer renderer)
 		if (!renderer.ObjectRenderers.Contains<DirectiveHtmlRenderer>())
 		{
 			// Must be inserted before CodeBlockRenderer
-			_ = renderer.ObjectRenderers.InsertBefore<CodeBlockRenderer>(new DirectiveHtmlRenderer(markdownParser));
+			_ = renderer.ObjectRenderers.InsertBefore<CodeBlockRenderer>(new DirectiveHtmlRenderer());
 		}
 
 		_ = renderer.ObjectRenderers.Replace<HeadingRenderer>(new SectionedHeadingRenderer());
diff --git a/src/Elastic.Markdown/Myst/MarkdownParser.cs b/src/Elastic.Markdown/Myst/MarkdownParser.cs
index befb60bba..67a7e9093 100644
--- a/src/Elastic.Markdown/Myst/MarkdownParser.cs
+++ b/src/Elastic.Markdown/Myst/MarkdownParser.cs
@@ -4,7 +4,6 @@
 
 using System.IO.Abstractions;
 using Cysharp.IO;
-using Elastic.Markdown.IO.Configuration;
 using Elastic.Markdown.Myst.CodeBlocks;
 using Elastic.Markdown.Myst.Comments;
 using Elastic.Markdown.Myst.Directives;
@@ -102,33 +101,33 @@ private static async Task<MarkdownDocument> ParseAsync(
 	}
 
 	// ReSharper disable once InconsistentNaming
-	private MarkdownPipeline? _minimalPipelineCached;
-	private MarkdownPipeline MinimalPipeline
+	private static MarkdownPipeline? MinimalPipelineCached;
+	private static MarkdownPipeline MinimalPipeline
 	{
 		get
 		{
-			if (_minimalPipelineCached is not null)
-				return _minimalPipelineCached;
+			if (MinimalPipelineCached is not null)
+				return MinimalPipelineCached;
 			var builder = new MarkdownPipelineBuilder()
 				.UseYamlFrontMatter()
 				.UseInlineAnchors()
 				.UseHeadingsWithSlugs()
-				.UseDirectives(this);
+				.UseDirectives();
 
 			_ = builder.BlockParsers.TryRemove<IndentedCodeBlockParser>();
-			_minimalPipelineCached = builder.Build();
-			return _minimalPipelineCached;
+			MinimalPipelineCached = builder.Build();
+			return MinimalPipelineCached;
 		}
 	}
 
 	// ReSharper disable once InconsistentNaming
-	private MarkdownPipeline? _pipelineCached;
-	public MarkdownPipeline Pipeline
+	private static MarkdownPipeline? PipelineCached;
+	public static MarkdownPipeline Pipeline
 	{
 		get
 		{
-			if (_pipelineCached is not null)
-				return _pipelineCached;
+			if (PipelineCached is not null)
+				return PipelineCached;
 
 			var builder = new MarkdownPipelineBuilder()
 				.UseInlineAnchors()
@@ -142,15 +141,15 @@ public MarkdownPipeline Pipeline
 				.UseYamlFrontMatter()
 				.UseGridTables()
 				.UsePipeTables()
-				.UseDirectives(this)
+				.UseDirectives()
 				.UseDefinitionLists()
 				.UseEnhancedCodeBlocks()
-				.UseHtmxLinkInlineRenderer(Build)
+				.UseHtmxLinkInlineRenderer()
 				.DisableHtml()
 				.UseHardBreaks();
 			_ = builder.BlockParsers.TryRemove<IndentedCodeBlockParser>();
-			_pipelineCached = builder.Build();
-			return _pipelineCached;
+			PipelineCached = builder.Build();
+			return PipelineCached;
 		}
 	}
 
diff --git a/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs b/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
index 8fae9da96..094bd432b 100644
--- a/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Markdown.Helpers;
-using Elastic.Markdown.IO.Configuration;
 using Markdig;
 using Markdig.Renderers;
 using Markdig.Renderers.Html.Inlines;
@@ -11,7 +10,7 @@
 
 namespace Elastic.Markdown.Myst.Renderers;
 
-public class HtmxLinkInlineRenderer(BuildContext build) : LinkInlineRenderer
+public class HtmxLinkInlineRenderer : LinkInlineRenderer
 {
 	protected override void Write(HtmlRenderer renderer, LinkInline link)
 	{
@@ -31,11 +30,11 @@ protected override void Write(HtmlRenderer renderer, LinkInline link)
 			_ = renderer.Write(" hx-get=\"");
 			_ = renderer.WriteEscapeUrl(link.GetDynamicUrl != null ? link.GetDynamicUrl() ?? link.Url : link.Url);
 			_ = renderer.Write('"');
-			_ = renderer.Write($" hx-select-oob=\"{Htmx.GetHxSelectOob(build.Configuration.Features, build.UrlPathPrefix, currentUrl, link.Url)}\"");
+			_ = renderer.Write($" hx-select-oob=\"{Htmx.GetHxSelectOob()}\"");
 			_ = renderer.Write(" hx-swap=\"none\"");
 			_ = renderer.Write(" hx-push-url=\"true\"");
 			_ = renderer.Write(" hx-indicator=\"#htmx-indicator\"");
-			_ = renderer.Write($" preload=\"{Htmx.GetPreload()}\"");
+			_ = renderer.Write(" preload=\"mouseover\"");
 
 			if (!string.IsNullOrEmpty(link.Title))
 			{
@@ -63,14 +62,14 @@ protected override void Write(HtmlRenderer renderer, LinkInline link)
 
 public static class CustomLinkInlineRendererExtensions
 {
-	public static MarkdownPipelineBuilder UseHtmxLinkInlineRenderer(this MarkdownPipelineBuilder pipeline, BuildContext build)
+	public static MarkdownPipelineBuilder UseHtmxLinkInlineRenderer(this MarkdownPipelineBuilder pipeline)
 	{
-		pipeline.Extensions.AddIfNotAlready(new HtmxLinkInlineRendererExtension(build));
+		pipeline.Extensions.AddIfNotAlready<HtmxLinkInlineRendererExtension>();
 		return pipeline;
 	}
 }
 
-public class HtmxLinkInlineRendererExtension(BuildContext build) : IMarkdownExtension
+public class HtmxLinkInlineRendererExtension : IMarkdownExtension
 {
 	public void Setup(MarkdownPipelineBuilder pipeline)
 	{
@@ -82,7 +81,7 @@ public void Setup(MarkdownPipeline pipeline, IMarkdownRenderer renderer)
 		if (renderer is HtmlRenderer htmlRenderer)
 		{
 			_ = htmlRenderer.ObjectRenderers.RemoveAll(x => x is LinkInlineRenderer);
-			htmlRenderer.ObjectRenderers.Add(new HtmxLinkInlineRenderer(build));
+			htmlRenderer.ObjectRenderers.Add(new HtmxLinkInlineRenderer());
 		}
 	}
 }
diff --git a/src/Elastic.Markdown/Slices/HtmlWriter.cs b/src/Elastic.Markdown/Slices/HtmlWriter.cs
index 55f16caf5..c4e5a1d1e 100644
--- a/src/Elastic.Markdown/Slices/HtmlWriter.cs
+++ b/src/Elastic.Markdown/Slices/HtmlWriter.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information
 using System.IO.Abstractions;
 using Elastic.Markdown.IO;
-using Elastic.Markdown.IO.Configuration;
-using Elastic.Markdown.IO.Navigation;
 using Markdig.Syntax;
 using RazorSlices;
 
@@ -14,25 +12,17 @@ public class HtmlWriter(DocumentationSet documentationSet, IFileSystem writeFile
 {
 	private DocumentationSet DocumentationSet { get; } = documentationSet;
 
-	private async Task<string> RenderNavigation(ConfigurationFile configuration, string topLevelGroupId, MarkdownFile markdown, Cancel ctx = default)
+	private async Task<string> RenderNavigation(MarkdownFile markdown, Cancel ctx = default)
 	{
-		var group = DocumentationSet.Tree.NavigationItems
-			.OfType<GroupNavigation>()
-			.FirstOrDefault(i => i.Group.Id == topLevelGroupId)?.Group;
-
 		var slice = Layout._TocTree.Create(new NavigationViewModel
 		{
-			Title = group?.Index?.NavigationTitle ?? DocumentationSet.Tree.Index!.NavigationTitle!,
-			TitleUrl = group?.Index?.Url ?? DocumentationSet.Tree.Index!.Url,
-			Tree = group ?? DocumentationSet.Tree,
-			CurrentDocument = markdown,
-			IsRoot = topLevelGroupId == DocumentationSet.Tree.Id,
-			Features = configuration.Features
+			Tree = DocumentationSet.Tree,
+			CurrentDocument = markdown
 		});
 		return await slice.RenderAsync(cancellationToken: ctx);
 	}
 
-	private readonly Dictionary<string, string> _renderedNavigationCache = [];
+	private string? _renderedNavigation;
 
 	public async Task<string> RenderLayout(MarkdownFile markdown, Cancel ctx = default)
 	{
@@ -40,41 +30,11 @@ public async Task<string> RenderLayout(MarkdownFile markdown, Cancel ctx = defau
 		return await RenderLayout(markdown, document, ctx);
 	}
 
-	private static string GetTopLevelGroupId(MarkdownFile markdown) =>
-		markdown.YieldParentGroups().Length > 1
-			? markdown.YieldParentGroups()[^2]
-			: markdown.YieldParentGroups()[0];
-
 	public async Task<string> RenderLayout(MarkdownFile markdown, MarkdownDocument document, Cancel ctx = default)
 	{
-		var html = markdown.CreateHtml(document);
+		var html = MarkdownFile.CreateHtml(document);
 		await DocumentationSet.Tree.Resolve(ctx);
-
-		var topLevelNavigationItems = DocumentationSet.Tree.NavigationItems
-			.OfType<GroupNavigation>()
-			.Select(i => i.Group);
-
-		string? navigationHtml;
-
-		if (DocumentationSet.Configuration.Features.IsPrimaryNavEnabled)
-		{
-			var topLevelGroupId = GetTopLevelGroupId(markdown);
-			if (!_renderedNavigationCache.TryGetValue(topLevelGroupId, out var value))
-			{
-				value = await RenderNavigation(DocumentationSet.Configuration, topLevelGroupId, markdown, ctx);
-				_renderedNavigationCache[topLevelGroupId] = value;
-			}
-			navigationHtml = value;
-		}
-		else
-		{
-			if (!_renderedNavigationCache.TryGetValue("root", out var value))
-			{
-				value = await RenderNavigation(DocumentationSet.Configuration, DocumentationSet.Tree.Id, markdown, ctx);
-				_renderedNavigationCache["root"] = value;
-			}
-			navigationHtml = value;
-		}
+		_renderedNavigation ??= await RenderNavigation(markdown, ctx);
 
 		var previous = DocumentationSet.GetPrevious(markdown);
 		var next = DocumentationSet.GetNext(markdown);
@@ -84,7 +44,6 @@ public async Task<string> RenderLayout(MarkdownFile markdown, MarkdownDocument d
 		var path = Path.Combine(DocumentationSet.RelativeSourcePath, markdown.RelativePath);
 		var editUrl = $"https://github.com/elastic/{remote}/edit/{branch}/{path}";
 
-
 		var slice = Index.Create(new IndexViewModel
 		{
 			Title = markdown.Title ?? "[TITLE NOT SET]",
@@ -95,13 +54,11 @@ public async Task<string> RenderLayout(MarkdownFile markdown, MarkdownDocument d
 			CurrentDocument = markdown,
 			PreviousDocument = previous,
 			NextDocument = next,
-			TopLevelNavigationItems = [.. topLevelNavigationItems],
-			NavigationHtml = navigationHtml,
+			NavigationHtml = _renderedNavigation,
 			UrlPathPrefix = markdown.UrlPathPrefix,
 			Applies = markdown.YamlFrontMatter?.AppliesTo,
 			GithubEditUrl = editUrl,
-			AllowIndexing = DocumentationSet.Build.AllowIndexing && !markdown.Hidden,
-			Features = DocumentationSet.Configuration.Features
+			AllowIndexing = DocumentationSet.Build.AllowIndexing && !markdown.Hidden
 		});
 		return await slice.RenderAsync(cancellationToken: ctx);
 	}
diff --git a/src/Elastic.Markdown/Slices/Index.cshtml b/src/Elastic.Markdown/Slices/Index.cshtml
index ec51e5529..85dfdb3e9 100644
--- a/src/Elastic.Markdown/Slices/Index.cshtml
+++ b/src/Elastic.Markdown/Slices/Index.cshtml
@@ -11,11 +11,9 @@
 		Previous = Model.PreviousDocument,
 		Next = Model.NextDocument,
 		NavigationHtml = Model.NavigationHtml,
-		TopLevelNavigationItems = Model.TopLevelNavigationItems,
 		UrlPathPrefix = Model.UrlPathPrefix,
 		GithubEditUrl = Model.GithubEditUrl,
 		AllowIndexing = Model.AllowIndexing,
-		Features = Model.Features
 	};
 }
 <section id="elastic-docs-v3">
diff --git a/src/Elastic.Markdown/Slices/Layout/_Breadcrumbs.cshtml b/src/Elastic.Markdown/Slices/Layout/_Breadcrumbs.cshtml
index cc71473ce..43999e8d6 100644
--- a/src/Elastic.Markdown/Slices/Layout/_Breadcrumbs.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_Breadcrumbs.cshtml
@@ -4,13 +4,13 @@
 	<li class="inline text-ink text-sm hover:text-ink leading-[1.2em] tracking-[-0.02em]" itemprop="itemListElement" itemscope="" itemtype="https://schema.org/ListItem">
 		<a 
 			itemprop="item"
-			href="@Model.Link("/")"
-			hx-get="@Model.Link("/")"
-			hx-select-oob="@Htmx.GetHxSelectOob(Model.Features, Model.UrlPathPrefix, Model.Link("/"), Model.CurrentDocument.Url)"
+			href="@Model.UrlPathPrefix/"
+			hx-get="@Model.UrlPathPrefix/"
+			hx-select-oob="@Htmx.GetHxSelectOob()"
 			hx-swap="none"
 			hx-push-url="true"
 			hx-indicator="#htmx-indicator"
-			preload="@Htmx.GetPreload()"
+			preload="mouseover"
 	>
 			<span itemprop="name" class="hover:text-ink">Elastic</span>
 		</a>
@@ -24,11 +24,11 @@
 				itemprop="item" 
 				href="@item.Url"
 				hx-get="@item.Url"
-				hx-select-oob="@Htmx.GetHxSelectOob(Model.Features, Model.UrlPathPrefix, item.Url, Model.CurrentDocument.Url)"
+				hx-select-oob="@Htmx.GetHxSelectOob()"
 				hx-swap="none"
 				hx-push-url="true"
 				hx-indicator="#htmx-indicator"
-				preload="@Htmx.GetPreload()"
+				preload="mouseover"
 			>
 				<span itemprop="name" class="hover:text-ink">@item.NavigationTitle</span>
 			</a>
diff --git a/src/Elastic.Markdown/Slices/Layout/_Header.cshtml b/src/Elastic.Markdown/Slices/Layout/_Header.cshtml
index 408653e35..08c58a81a 100644
--- a/src/Elastic.Markdown/Slices/Layout/_Header.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_Header.cshtml
@@ -1,196 +1,27 @@
-@using Elastic.Markdown.Helpers
 @inherits RazorSlice<LayoutViewModel>
-
-@{
-	string GetHxAttributes(string url)
-	{
-		return Htmx.GetHxAttributes(Model.Features, Model.UrlPathPrefix, Model.CurrentDocument.Url, url);
-	}
-
-	var primaryNavViewModel = new PrimaryNavViewModel
-	{
-		Items =
-		[
-			new PrimaryNavItemViewModel
-			{
-				Title = "Get Started",
-				HtmxAttributes = GetHxAttributes(Model.Link("/get-started")),
-				Url = Model.Link("/get-started"),
-			},
-			new PrimaryNavItemViewModel
-			{
-				Title = "Solutions and use cases",
-				Url = Model.Link("/solutions"),
-				HtmxAttributes = GetHxAttributes(Model.Link("/solutions")),
-				DropdownItems = [
-					new PrimaryNavDropdownItemViewModel
-					{
-						IconPath = Model.Static("observability-logo-color-64px.svg"), 
-						IconAlt = "Observability logo", 
-						Title = "Observability", 
-						Description = "Unify app and infrastructure visibility to proactively resolve issues.", 
-						Url =  Model.Link("/solutions/observability"),
-						HtmxAttributes = Htmx.GetHxAttributes(
-							Model.Features,
-							Model.CurrentDocument.UrlPathPrefix,
-							Model.CurrentDocument.Url, 
-							Model.Link("/solutions/security")
-						)
-					},
-					new PrimaryNavDropdownItemViewModel
-					{
-						IconPath = Model.Static("security-logo-color-64px.svg"), 
-						IconAlt = "Security logo",
-						Title = "Security",
-						Description = "Protect, investigate, and respond to cyber threats with AI-driven security analytics.", 
-						Url =  Model.Link("/solutions/security"),
-						HtmxAttributes = GetHxAttributes(Model.Link("/solutions/security"))
-					},
-					new PrimaryNavDropdownItemViewModel
-					{
-						IconPath = Model.Static("elasticsearch-logo-color-64px.svg"),
-						IconAlt = "Search logo",
-						Title = "Search",
-						Description = "Discover a world of AI possibilities — built with the power of search.",
-						Url = Model.Link("/solutions/search"),
-						HtmxAttributes = GetHxAttributes(Model.Link("/solutions/search"))
-					}
-				]
-			},
-			new PrimaryNavItemViewModel
-			{
-				Title = "Work with the stack",
-				DropdownItems = [
-					new PrimaryNavDropdownItemViewModel
-					{
-						Title = "Manage data", 
-						Description = "Discover a world of AI possibilities — built with the power of search.",
-						Url = Model.Link("/manage-data"),
-						HtmxAttributes = GetHxAttributes(Model.Link("/manage-data"))
-					},
-					new PrimaryNavDropdownItemViewModel
-					{
-						Title = "Explore and analyze",
-						Description = "Unify app and infrastructure visibility to proactively resolve issues.", 
-						Url = Model.Link("/explore-analyze"),
-						HtmxAttributes = GetHxAttributes(Model.Link("/explore-analyze"))
-					},
-					new PrimaryNavDropdownItemViewModel
-					{
-						Title = "Deploy and manage", 
-						Description = "Unify app and infrastructure visibility to proactively resolve issues.", 
-						Url = Model.Link("/deploy-manage"),
-						HtmxAttributes = GetHxAttributes(Model.Link("/deploy-manage"))
-
-					},
-					new PrimaryNavDropdownItemViewModel
-					{
-						Title = "Manage your cloud",
-						Description = "Unify app and infrastructure visibility to proactively resolve issues.",
-						Url = Model.Link("/cloud-account"),
-						HtmxAttributes = GetHxAttributes(Model.Link("/cloud-account"))
-					},
-				]
-			},
-			new PrimaryNavItemViewModel
-			{
-				Title = "Troubleshoot",
-				HtmxAttributes = GetHxAttributes(Model.Link("/troubleshoot")),
-				Url = Model.Link("/troubleshoot"),
-			},
-		]
-	};
-}
-
-<div class="bg-blue-developer">
-	
-</div>
-<header id="main-header" class="sticky top-0 z-50 max-w-screen bg-white border-b-1 border-grey-20">
-	<div class="flex items-center justify-center h-21 bg-white px-6">
-		<div class="container flex flex-wrap lg:flex-nowrap justify-start items-center">
-			<div class="h-10 mr-10">
-				<a href="@Model.UrlPathPrefix/">
-					<img src="@Model.Static("logo-elastic-horizontal-color.svg")" alt="Elastic" height="40" width="116">
-				</a>
-			</div>
-			@if (Model.Features.IsPrimaryNavEnabled)
-			{
-				@await RenderPartialAsync(_PrimaryNav.Create(primaryNavViewModel))
-			}
-			else
-			{
-				<div class="grow"></div>
-			}
-			<form role="search" class="shrink-0 mx-2 h-10 w-50" autocomplete="off">
-				<label for="default-search" class="mb-2 text-sm font-medium text-gray-900 sr-only dark:text-white">Search</label>
-				<div class="relative h-10">
-					<div class="absolute inset-y-0 start-0 flex items-center ps-3 pointer-events-none ml-2">
-						<svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
-							<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z"/>
-						</svg>
-					</div>
-					<div class="rounded-full bg-linear-65 from-pink/[.4] to-teal/[.4] p-[2px] h-10">
-						<input type="search" id="default-search" class="flex items-center h-full w-full p-2 ps-10 bg-white rounded-full focus-visible:outline-[blue]/[.3] focus-visible:outline-2 truncate text-ellipsis" placeholder="Search" required/>
-					</div>
+<header class="sticky top-0 z-50 bg-blue-developer max-w-screen px-6 pb-6 flex items-center justify-center">
+	<div class="container flex flex-wrap lg:flex-nowrap">
+		<div class="h-10 mt-6 basis-full lg:basis-auto">
+			<a href="@Model.UrlPathPrefix/">
+				<img src="@Model.Static("logo-elastic-horizontal-color-reverse.svg")" alt="Elastic" class="h-10">
+			</a>
+		</div>
+		<form role="search" class="hidden lg:block grow basis-full lg:basis-auto shrink-0 mt-6 lg:mx-10 h-10" autocomplete="off">
+			<label for="default-search" class="mb-2 text-sm font-medium text-gray-900 sr-only dark:text-white">Search</label>
+			<div class="relative h-10">
+				<div class="absolute inset-y-0 start-0 flex items-center ps-3 pointer-events-none ml-2">
+					<svg class="w-4 h-4 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
+						<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z"/>
+					</svg>
+				</div>
+				<div class="rounded-full bg-linear-65 from-pink/[.4] to-teal/[.4] p-[2px] h-10">
+					<input type="search" id="default-search" class="flex items-center h-full w-full p-2 ps-10 text-center bg-[#081335] rounded-full focus-visible:outline-[blue]/[.3] focus-visible:outline-2 truncate text-ellipsis text-white" placeholder="Try searching a document here..." required/>
 				</div>
-			</form>
-			<div class="flex grow lg:flex-none h-10">
-				<a href="https://cloud.elastic.co/registration" class="grow select-none cursor-pointer text-white text-nowrap bg-blue-elastic hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-semibold rounded-sm px-6 py-2.5 me-3 focus:outline-none h-10 flex items-center justify-center">Start free trial</a>
-				@* <a href="https://elastic.co/contact" class="grow cursor-pointer text-white text-nowrap border-2 border-white focus:ring-4 focus:outline-none focus:ring-blue-300 font-semibold rounded-sm px-6 py-2.5 text-center h-10 flex items-center justify-center">Contact Sales</a> *@
 			</div>
+		</form>
+		<div class="flex grow lg:flex-none h-10 mt-6">
+			<a href="https://cloud.elastic.co/registration" class="grow select-none cursor-pointer text-white text-nowrap bg-blue-elastic hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-semibold rounded-sm px-6 py-2.5 me-3 focus:outline-none h-10 flex items-center justify-center">Start free trial</a>
+			<a href="https://elastic.co/contact" class="grow cursor-pointer text-white text-nowrap border-2 border-white focus:ring-4 focus:outline-none focus:ring-blue-300 font-semibold rounded-sm px-6 py-2.5 text-center h-10 flex items-center justify-center">Contact Sales</a>
 		</div>
 	</div>
 </header>
-@if (Model.Features.IsPrimaryNavEnabled)
-{
-	<nav id="secondary-nav" class="bg-grey-10 border-b-1 border-grey-20 font-sans font-semibold px-6 pt-6">
-		<div class="container flex mx-auto justify-between">
-			<ul class="flex gap-6">
-				@if (!Model.Features.IsPrimaryNavEnabled)
-				{
-					@foreach (var navItem in Model.TopLevelNavigationItems)
-					{
-						@if (navItem.Index != null)
-						{
-							var isCurrent = Htmx.HasSameTopLevelGroup(Model.UrlPathPrefix, Model.CurrentDocument.Url, navItem.Index.Url);
-							<li class="border-b-2 text-nowrap pb-2 -mb-[1px] @(isCurrent ? "text-blue-elastic border-b-blue-elastic" : "border-b-transparent hover:text-black")">
-								<a
-									href="@navItem.Index.Url"
-									hx-get="@navItem.Index.Url"
-									hx-select-oob="@Htmx.GetHxSelectOob(Model.Features, Model.CurrentDocument.UrlPathPrefix, Model.CurrentDocument.Url, navItem.Index.Url)"
-									hx-swap="none"
-									hx-push-url="true"
-									hx-indicator="#htmx-indicator"
-									preload="@Htmx.GetPreload()">
-									@navItem.Index.NavigationTitle
-								</a>
-							</li>
-						}
-					}
-				}
-			</ul>
-			<ul class="flex gap-6">
-				<li class="border-b-2 text-nowrap pb-2 -mb-[1px] border-b-transparent hover:text-black">
-					<a href="@Model.Link("/release-notes")" class="flex">
-						<span>What's New</span>
-					</a>
-				</li>
-				<li class="border-b-2 text-nowrap pb-2 -mb-[1px] border-b-transparent hover:text-black">
-					<a href="@Model.Link("/reference")" class="flex">
-						<span>Reference</span>
-					</a>
-				</li>
-				<li class="border-b-2 text-nowrap pb-2 -mb-[1px] border-b-transparent hover:text-black">
-					<a href="https://elastic.co" class="flex gap-1" target="_blank" rel="noopener noreferrer">
-						<span>
-							Visit Elastic.co
-						</span>
-						<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-3">
-							<path stroke-linecap="round" stroke-linejoin="round" d="M13.5 6H5.25A2.25 2.25 0 0 0 3 8.25v10.5A2.25 2.25 0 0 0 5.25 21h10.5A2.25 2.25 0 0 0 18 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"/>
-						</svg>
-					</a>
-				</li>
-			</ul>
-		</div>
-	</nav>
-}
diff --git a/src/Elastic.Markdown/Slices/Layout/_PagesNav.cshtml b/src/Elastic.Markdown/Slices/Layout/_PagesNav.cshtml
index 71fbca700..5e8e2c246 100644
--- a/src/Elastic.Markdown/Slices/Layout/_PagesNav.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_PagesNav.cshtml
@@ -1,5 +1,5 @@
 @inherits RazorSlice<LayoutViewModel>
-<aside class="sidebar hidden lg:block order-1 w-70 xl:w-80 shrink-0 border-r-1 border-r-gray-200"
+<aside class="sidebar hidden lg:block order-1 w-100 border-r-1 border-r-gray-200"
 >
 	<nav
 		id="pages-nav"
diff --git a/src/Elastic.Markdown/Slices/Layout/_PrevNextNav.cshtml b/src/Elastic.Markdown/Slices/Layout/_PrevNextNav.cshtml
index f0b016222..37eb82075 100644
--- a/src/Elastic.Markdown/Slices/Layout/_PrevNextNav.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_PrevNextNav.cshtml
@@ -8,11 +8,11 @@
 				<a 
 					href="@Model.Previous.Url"
 					hx-get="@Model.Previous.Url"
-					hx-select-oob="@Htmx.GetHxSelectOob(Model.Features, Model.CurrentDocument.UrlPathPrefix, Model.CurrentDocument.Url, Model.Previous.Url)"
+					hx-select-oob="@Htmx.GetHxSelectOob()"
 					hx-swap="none"
 					hx-push-url="true"
 					hx-indicator="#htmx-indicator"
-					preload="@Htmx.GetPreload()"
+					preload="mouseover"
 					class="flex h-full items-center text-ink-light hover:black border-1 border-gray-300 hover:border-gray-500 rounded-lg p-6 shadow-md"
 				>
 					<svg class="size-6 mr-2" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
@@ -31,11 +31,11 @@
 				<a 
 					href="@Model.Next.Url"
 					hx-get="@Model.Next.Url"
-					hx-select-oob="@Htmx.GetHxSelectOob(Model.Features, Model.CurrentDocument.UrlPathPrefix, Model.CurrentDocument.Url, Model.Next.Url)"
+					hx-select-oob="@Htmx.GetHxSelectOob()"
 					hx-swap="none"
 					hx-push-url="true"
 					hx-indicator="#htmx-indicator"
-					preload="@Htmx.GetPreload()"
+					preload="mouseover"
 					class="flex h-full items-center justify-end text-ink-light hover:black border-1 border-gray-300 hover:border-gray-500 rounded-lg p-6 shadow-md text-right"
 				>
 					<div>
diff --git a/src/Elastic.Markdown/Slices/Layout/_PrimaryNav.cshtml b/src/Elastic.Markdown/Slices/Layout/_PrimaryNav.cshtml
deleted file mode 100644
index 965c93b6c..000000000
--- a/src/Elastic.Markdown/Slices/Layout/_PrimaryNav.cshtml
+++ /dev/null
@@ -1,58 +0,0 @@
-@inherits RazorSlice<PrimaryNavViewModel>
-<nav class="grow" id="primary-nav">
-	<ul class="flex items-center justify-start h-full text-ink font-sans gap-6">
-		@foreach (var navItem in Model.Items)
-		{
-			<li class="relative group h-full flex items-center">
-				
-				@if (string.IsNullOrEmpty(navItem.Url))
-				{
-					<button class="text-nowrap font-semibold flex items-center gap-1">
-						<span>@navItem.Title</span>
-						@if (navItem.DropdownItems.Count > 0)
-						{
-							<svg
-								xmlns="http://www.w3.org/2000/svg"
-								fill="none"
-								viewBox="0 0 24 24"
-								stroke-width="1.5"
-								stroke="currentColor"
-								width="16">
-								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
-							</svg>
-						}
-					</button>
-				}
-				else
-				{
-					<a @navItem.HtmxAttributes class="peer text-nowrap font-semibold flex items-center gap-1 hover:text-blue-elastic" href="@navItem.Url">
-						<span>@navItem.Title</span>
-						@if (navItem.DropdownItems.Count > 0)
-						{
-							<svg
-								xmlns="http://www.w3.org/2000/svg"
-								fill="none"
-								viewBox="0 0 24 24"
-								stroke-width="1.5"
-								stroke="currentColor"
-								width="16">
-								<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
-							</svg>
-						}
-					</a>
-				}
-				@if (navItem.DropdownItems.Count > 0)
-				{
-					<div class="hidden z-60 group-hover:z-70 group-focus-within:block group-hover:block peer-active:hidden absolute top-full -left-4 pt-2">
-						<ul class="bg-white text-ink rounded-lg shadow-lg border-1 border-grey-20 font-body w-100">
-							@foreach (var item in navItem.DropdownItems)
-							{
-								@await RenderPartialAsync(_PrimaryNavDropdownItem.Create(item))
-							}
-						</ul>
-					</div>
-				}
-			</li>
-		}
-	</ul>
-</nav>
diff --git a/src/Elastic.Markdown/Slices/Layout/_PrimaryNavDropdownItem.cshtml b/src/Elastic.Markdown/Slices/Layout/_PrimaryNavDropdownItem.cshtml
deleted file mode 100644
index 223e1bd84..000000000
--- a/src/Elastic.Markdown/Slices/Layout/_PrimaryNavDropdownItem.cshtml
+++ /dev/null
@@ -1,14 +0,0 @@
-@using Elastic.Markdown.Helpers
-@inherits RazorSlice<PrimaryNavDropdownItemViewModel>
-<li class="pb-6 first:pt-6 px-8 flex gap-3">
-	@if (Model.IconPath != null)
-	{
-		<div class="size-9 flex items-center justify-center rounded-lg bg-grey-10 shrink-0">
-			<img alt="@Model.IconAlt" src="@Model.IconPath" width="18" height="18"/>
-		</div>
-	}
-	<a href="@Model.Url" class="hover:underline" @Model.HtmxAttributes>
-		<strong class="font-semibold">@Model.Title</strong>
-		<p class="text-sm text-ink-light">@Model.Description</p>
-	</a>
-</li>
diff --git a/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml b/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml
index fc1072ca0..208aada6b 100644
--- a/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_TableOfContents.cshtml
@@ -1,5 +1,5 @@
 @inherits RazorSlice<LayoutViewModel>
-<aside class="sidebar hidden xl:block order-3 border-l-1 border-l-gray-200 w-80">
+<aside class="sidebar hidden lg:block order-3 border-l-1 border-l-gray-200 w-80">
 	<nav id="toc-nav" class="sidebar-nav pl-6">
 		<div class="pt-6 pb-20">
 			@if (Model.PageTocItems.Count > 0)
diff --git a/src/Elastic.Markdown/Slices/Layout/_TocTree.cshtml b/src/Elastic.Markdown/Slices/Layout/_TocTree.cshtml
index fa1689a9f..8e837e00d 100644
--- a/src/Elastic.Markdown/Slices/Layout/_TocTree.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_TocTree.cshtml
@@ -1,21 +1,12 @@
-@using Elastic.Markdown.Helpers
 @inherits RazorSlice<NavigationViewModel>
 <div class="pt-6 pb-20">
-	<a
-		href="@Model.TitleUrl"
-		@Htmx.GetHxAttributes(Model.Features, Model.CurrentDocument.UrlPathPrefix, Model.CurrentDocument.Url, Model.TitleUrl)
-		class="font-semibold text-ink hover:text-black"
-		>
-		@Model.Title
-	</a>
+	<div class="font-bold">Elastic Docs</div>
 	<ul class="block">
 		@await RenderPartialAsync(_TocTreeNav.Create(new NavigationTreeItem
 		{
-			Features = Model.Features,
 			Level = Model.Tree.Depth,
 			SubTree = Model.Tree,
-			CurrentDocument = Model.CurrentDocument,
-			IsRoot = Model.IsRoot
+			CurrentDocument = Model.CurrentDocument
 		}))
 	</ul>
 </div>
diff --git a/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml b/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml
index 21f412be1..6c7f839a6 100644
--- a/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml
@@ -1,49 +1,43 @@
 @using Elastic.Markdown.Helpers
 @using Elastic.Markdown.IO.Navigation
 @inherits RazorSlice<NavigationTreeItem>
-@{
-	var topLevel = Model.IsRoot ? 1 : 2;
-}
 @foreach (var item in Model.SubTree.NavigationItems)
 {
 	var id = item.Id;
 	if (item is FileNavigation file)
 	{
 		var f = file.File;
-		<li class="block group/li mt-1">
+		<li class="block ml-2 pl-2 border-l-1 border-l-gray-200 group/li">
+			<div class="flex">
 				<a
 					hx-get="@f.Url"
-					hx-select-oob="@Htmx.GetHxSelectOob(Model.Features, Model.CurrentDocument.UrlPathPrefix, Model.CurrentDocument.Url, f.Url)"
-					data-current-url="@Model.CurrentDocument.Url"
-					data-target-url="@f.Url"
-					data-path-prefix="@Model.CurrentDocument.UrlPathPrefix"
-					data-has-same-segment="@Htmx.HasSameTopLevelGroup(Model.CurrentDocument.UrlPathPrefix, Model.CurrentDocument.Url, f.Url)"
+					hx-select-oob="@Htmx.GetHxSelectOob()"
 					hx-swap="none"
 					hx-push-url="true"
 					hx-indicator="#htmx-indicator"
-					preload
-					class="sidebar-link group-[.current]/li:text-blue-elastic!"
+					preload="mouseover"
+					class="sidebar-link my-1 ml-5 group-[.current]/li:text-blue-elastic!"
 					id="page-@id"
 					href="@f.Url">
 					@f.NavigationTitle
 				</a>
+			</div>
 		</li>
 	}
 	else if (item is GroupNavigation folder)
 	{
 		var g = folder.Group;
-		// const int initialExpandLevel = 3;
-		// var shouldInitiallyExpand = g.Depth <= initialExpandLevel;
-		<li class="flex flex-wrap group-navigation mt-2">
-			<label for="@id" class="peer group/label flex items-start">
+		const int initialExpandLevel = 1;
+		var shouldInitiallyExpand = g.Depth <= initialExpandLevel;
+		<li class="flex flex-wrap group-navigation @(g.Depth > 1 ? "ml-2 pl-2 border-l-1 border-l-gray-200" : string.Empty)">
+			<label for="@id" class="peer group/label flex items-center overflow-hidden @(g.Depth == 1 ? "mt-2" : "")">
 				<svg
 					xmlns="http://www.w3.org/2000/svg"
 					fill="none"
 					viewBox="0 0 24 24"
 					stroke-width="1.5"
 					stroke="currentColor"
-					width="12"
-					class="w-3 mr-1 mt-[3px] shrink-0 -rotate-90 group-has-checked/label:rotate-0 cursor-pointer @(g.Depth == topLevel ? "hidden" : "")">
+					class="w-4 mr-1 shrink -rotate-90 group-has-checked/label:rotate-0 cursor-pointer text-ink">
 					<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
 				</svg>
 				<input
@@ -51,27 +45,29 @@
 					type="checkbox"
 					class="hidden"
 					aria-hidden="true"
-					@(g.Depth <= topLevel ? "checked" : "")
-					@(g.Depth <= topLevel ? "disabled" : "")
-					>
+					@(shouldInitiallyExpand ? "checked" : string.Empty)
+				>
 				<a
-					href="@(g.Index?.Url ?? "")"
-					@Htmx.GetHxAttributes(Model.Features, Model.CurrentDocument.UrlPathPrefix, Model.CurrentDocument.Url, g.Index?.Url ?? "")
-					id="page-@(g.Index?.Id ?? id)"
-					class="sidebar-link @(g.Depth == topLevel ? "font-semibold mt-2" : "")">
-					@(g.Index?.NavigationTitle ?? "Untitled")
+					href="@g.Index?.Url"
+					hx-get="@g.Index?.Url"
+					hx-select-oob="@Htmx.GetHxSelectOob()"
+					hx-swap="none"
+					hx-push-url="true"
+					hx-indicator="#htmx-indicator"
+					preload="mouseover"
+					id="page-@g.Index?.Id"
+					class="sidebar-link inline-block my-1 @(g.Depth == 1 ? "uppercase tracking-[0.05em] text-ink-light font-semibold" : string.Empty)">
+					@g.Index?.NavigationTitle
 				</a>
 			</label>
 			@if (g.NavigationItems.Count > 0)
 			{
-				<ul class="w-full hidden peer-has-checked:block peer-has-[:focus]:block focus-within:block @(g.Depth > topLevel ? "ml-4": "ml-4")">
+				<ul class="w-full overflow-y-hidden hidden peer-has-checked:block peer-has-[:focus]:block has-[:focus]:block">
 					@await RenderPartialAsync(_TocTreeNav.Create(new NavigationTreeItem
 					{
-						Features = Model.Features,
 						Level = g.Depth,
 						CurrentDocument = Model.CurrentDocument,
-						SubTree = g,
-						IsRoot = Model.IsRoot
+						SubTree = g
 					}))
 				</ul>
 			}
diff --git a/src/Elastic.Markdown/Slices/_Layout.cshtml b/src/Elastic.Markdown/Slices/_Layout.cshtml
index 902294ee2..7486c3bde 100644
--- a/src/Elastic.Markdown/Slices/_Layout.cshtml
+++ b/src/Elastic.Markdown/Slices/_Layout.cshtml
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html lang="en" class="h-screen">
 @await RenderPartialAsync(_Head.Create(Model))
-<body class="text-ink" hx-ext="preload, head-support">
+<body class="text-ink" hx-ext="preload,head-support">
 @(await RenderPartialAsync(_Header.Create(Model)))
 <div class="flex flex-col items-center px-6">
 	<div class="container flex">
diff --git a/src/Elastic.Markdown/Slices/_ViewModels.cs b/src/Elastic.Markdown/Slices/_ViewModels.cs
index 7b2f088b3..f1193d1f5 100644
--- a/src/Elastic.Markdown/Slices/_ViewModels.cs
+++ b/src/Elastic.Markdown/Slices/_ViewModels.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 using Elastic.Markdown.IO;
-using Elastic.Markdown.IO.Configuration;
 using Elastic.Markdown.IO.Navigation;
 using Elastic.Markdown.Myst.FrontMatter;
 
@@ -18,15 +17,11 @@ public class IndexViewModel
 	public required MarkdownFile CurrentDocument { get; init; }
 	public required MarkdownFile? PreviousDocument { get; init; }
 	public required MarkdownFile? NextDocument { get; init; }
-
-	public required DocumentationGroup[] TopLevelNavigationItems { get; init; }
-
 	public required string NavigationHtml { get; init; }
 	public required string? UrlPathPrefix { get; init; }
 	public required string? GithubEditUrl { get; init; }
 	public required ApplicableTo? Applies { get; init; }
 	public required bool AllowIndexing { get; init; }
-	public required FeatureFlags Features { get; init; }
 }
 
 public class LayoutViewModel
@@ -47,9 +42,6 @@ public class LayoutViewModel
 	public required string? UrlPathPrefix { get; set; }
 	public required string? GithubEditUrl { get; set; }
 	public required bool AllowIndexing { get; init; }
-	public required FeatureFlags Features { get; init; }
-
-	public required DocumentationGroup[] TopLevelNavigationItems { get; init; }
 
 	private MarkdownFile[]? _parents;
 	public MarkdownFile[] Parents
@@ -87,12 +79,8 @@ public record PageTocItem
 
 public class NavigationViewModel
 {
-	public required string Title { get; init; }
-	public required string TitleUrl { get; init; }
 	public required DocumentationGroup Tree { get; init; }
 	public required MarkdownFile CurrentDocument { get; init; }
-	public required bool IsRoot { get; init; }
-	public required FeatureFlags Features { get; init; }
 }
 
 public class NavigationTreeItem
@@ -100,29 +88,4 @@ public class NavigationTreeItem
 	public required int Level { get; init; }
 	public required MarkdownFile CurrentDocument { get; init; }
 	public required DocumentationGroup SubTree { get; init; }
-	public required bool IsRoot { get; init; }
-	public required FeatureFlags Features { get; init; }
-}
-
-public class PrimaryNavViewModel
-{
-	public required List<PrimaryNavItemViewModel> Items { get; init; } = [];
-}
-
-public class PrimaryNavItemViewModel
-{
-	public required string Title { get; init; }
-	public string? Url { get; init; }
-	public string? HtmxAttributes { get; init; }
-	public List<PrimaryNavDropdownItemViewModel> DropdownItems { get; init; } = [];
-}
-
-public class PrimaryNavDropdownItemViewModel
-{
-	public required string Title { get; init; }
-	public required string Description { get; init; }
-	public string? IconPath { get; init; }
-	public string? IconAlt { get; init; }
-	public required string Url { get; init; }
-	public required string HtmxAttributes { get; init; }
 }
diff --git a/src/Elastic.Markdown/_static/elasticsearch-logo-color-64px.svg b/src/Elastic.Markdown/_static/elasticsearch-logo-color-64px.svg
deleted file mode 100644
index 4f97b4c32..000000000
--- a/src/Elastic.Markdown/_static/elasticsearch-logo-color-64px.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_0_6316)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M55.7246 14.7075L55.7276 14.7015C50.7746 8.77351 43.3286 4.99951 34.9996 4.99951C24.4006 4.99951 15.2326 11.1115 10.8136 19.9995H46.0056C48.5306 19.9995 50.9886 19.1295 52.9206 17.5035C53.9246 16.6585 54.8636 15.7385 55.7246 14.7075Z" fill="#FEC514"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 32C8 34.422 8.324 36.767 8.922 39H42C45.866 39 49 35.866 49 32C49 28.134 45.866 25 42 25H8.922C8.324 27.233 8 29.578 8 32Z" fill="#343741"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M55.7246 49.2925L55.7276 49.2985C50.7746 55.2265 43.3286 59.0005 34.9996 59.0005C24.4006 59.0005 15.2326 52.8885 10.8136 44.0005H46.0056C48.5306 44.0005 50.9886 44.8705 52.9206 46.4965C53.9246 47.3415 54.8636 48.2615 55.7246 49.2925Z" fill="#00BFB3"/>
-</g>
-<defs>
-<clipPath id="clip0_0_6316">
-<rect width="64" height="64" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/src/Elastic.Markdown/_static/logo-elastic-horizontal-color.svg b/src/Elastic.Markdown/_static/logo-elastic-horizontal-color.svg
deleted file mode 100644
index cb16ed309..000000000
--- a/src/Elastic.Markdown/_static/logo-elastic-horizontal-color.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<svg width="500" height="172" viewBox="0 0 500 172" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_15_21)">
-<path d="M172.05 89.79C172.066 82.8086 169.924 75.9929 165.915 70.2767C161.907 64.5606 156.229 60.2236 149.66 57.86C150.258 54.813 150.559 51.7152 150.56 48.61C150.566 38.3319 147.312 28.3167 141.267 20.0043C135.222 11.6919 126.697 5.51043 116.917 2.3487C107.138 -0.813038 96.6072 -0.792202 86.8401 2.40821C77.073 5.60863 68.5722 11.8238 62.5601 20.16C58.1246 16.7229 52.6898 14.8248 47.0788 14.7535C41.4678 14.6822 35.9865 16.4414 31.465 19.7646C26.9435 23.0879 23.6283 27.7942 22.0214 33.1707C20.4146 38.5471 20.6037 44.3007 22.5601 49.56C15.9754 51.9601 10.2837 56.3191 6.25042 62.0507C2.21719 67.7824 0.0359539 74.6117 0.000115291 81.62C-0.018156 88.6256 2.13571 95.4646 6.16517 101.195C10.1946 106.926 15.9015 111.267 22.5001 113.62C21.916 116.666 21.618 119.759 21.6101 122.86C21.6003 133.126 24.8511 143.13 30.8937 151.43C36.9364 159.729 45.4586 165.895 55.2317 169.039C65.0048 172.182 75.5237 172.141 85.2717 168.92C95.0197 165.7 103.493 159.467 109.47 151.12C113.893 154.566 119.318 156.475 124.924 156.559C130.53 156.643 136.01 154.896 140.533 151.584C145.057 148.271 148.377 143.574 149.989 138.205C151.602 132.835 151.42 127.087 149.47 121.83C156.058 119.434 161.754 115.076 165.789 109.344C169.825 103.612 172.006 96.7803 172.04 89.77" fill="white"/>
-<path d="M67.64 73.81L105.29 91L143.29 57.72C143.837 54.974 144.109 52.1801 144.1 49.38C144.098 40.315 141.195 31.4886 135.815 24.1923C130.436 16.896 122.863 11.5129 114.203 8.83068C105.544 6.14846 96.254 6.30793 87.6921 9.28575C79.1301 12.2636 71.7459 17.9034 66.62 25.38L60.29 58.12L67.64 73.81Z" fill="#FEC514"/>
-<path d="M28.6701 113.68C28.115 116.469 27.8369 119.306 27.8401 122.15C27.8403 131.253 30.7583 140.116 36.1659 147.438C41.5735 154.761 49.1858 160.157 57.8857 162.835C66.5856 165.513 75.9149 165.332 84.5043 162.318C93.0937 159.305 100.491 153.617 105.61 146.09L111.88 113.42L103.51 97.4201L65.7201 80.2001L28.6701 113.68Z" fill="#02BCB7"/>
-<path d="M28.4401 48.53L54.2401 54.62L59.8901 25.28C56.3809 22.6191 52.1042 21.1665 47.7004 21.1397C43.2965 21.1128 39.0024 22.5133 35.4611 25.1313C31.9198 27.7492 29.3218 31.4439 28.0561 35.662C26.7904 39.8802 26.9251 44.3948 28.4401 48.53Z" fill="#F04E98"/>
-<path d="M26.2002 54.67C20.5394 56.5802 15.6146 60.2071 12.1108 65.0461C8.60695 69.8852 6.69825 75.6959 6.65015 81.67C6.64608 87.4439 8.39949 93.0822 11.6773 97.8354C14.955 102.589 19.6019 106.232 25.0002 108.28L61.2002 75.56L54.5502 61.36L26.2002 54.67Z" fill="#1BA9F5"/>
-<path d="M112.23 146.09C115.734 148.737 120 150.181 124.391 150.204C128.782 150.227 133.063 148.83 136.594 146.22C140.126 143.61 142.718 139.927 143.985 135.722C145.251 131.518 145.123 127.016 143.62 122.89L117.84 116.89L112.23 146.09Z" fill="#9ADC30"/>
-<path d="M117.47 110.1L145.85 116.73C151.514 114.825 156.442 111.2 159.947 106.359C163.452 101.519 165.358 95.7057 165.4 89.7301C165.395 83.9684 163.638 78.3445 160.363 73.6044C157.087 68.8644 152.448 65.2323 147.06 63.1901L109.94 95.6901L117.47 110.1Z" fill="#0B64DD"/>
-<path d="M240.56 120.4L244 120.05L244.24 127.05C236.585 128.206 228.861 128.841 221.12 128.95C212.587 128.95 206.54 126.48 202.98 121.54C199.42 116.6 197.643 108.913 197.65 98.48C197.65 77.7 205.91 67.3067 222.43 67.3C230.43 67.3 236.397 69.5334 240.33 74C244.264 78.4667 246.237 85.4667 246.25 95L245.78 101.76H206.66C206.66 108.32 207.847 113.18 210.22 116.34C212.594 119.5 216.72 121.08 222.6 121.08C228.494 121.1 234.48 120.873 240.56 120.4ZM237.36 94.68C237.36 87.4067 236.197 82.27 233.87 79.27C231.543 76.27 227.75 74.7667 222.49 74.76C217.23 74.76 213.277 76.34 210.63 79.5C207.984 82.66 206.62 87.72 206.54 94.68H237.36Z" fill="#1C1E23"/>
-<path d="M258.65 128.48V50.48H267.54V128.48H258.65Z" fill="#1C1E23"/>
-<path d="M323.53 86.38V116.28C323.53 119.28 330.91 119.12 330.91 119.12L330.46 126.98C324.21 126.98 319.04 127.5 315.94 124.49C309.227 127.472 301.955 128.989 294.61 128.94C289.163 128.94 285.013 127.397 282.16 124.31C279.307 121.223 277.883 116.787 277.89 111C277.89 105.227 279.353 100.977 282.28 98.25C285.207 95.5234 289.79 93.8567 296.03 93.25L314.64 91.48V86.38C314.64 82.38 313.773 79.4934 312.04 77.72C311.09 76.8285 309.97 76.1385 308.746 75.6917C307.522 75.2449 306.221 75.0504 304.92 75.12H281.56V67.29H304.33C311.05 67.29 315.93 68.8334 318.97 71.92C322.01 75.0067 323.53 79.8267 323.53 86.38ZM287 110.56C287 117.833 290 121.47 296 121.47C301.413 121.464 306.786 120.541 311.89 118.74L314.61 117.79V98.23L297.1 99.89C293.54 100.21 290.97 101.237 289.39 102.97C287.81 104.703 287.013 107.233 287 110.56Z" fill="#1C1E23"/>
-<path d="M358.24 75.24C349.62 75.24 345.31 78.24 345.31 84.24C345.31 87.0134 346.31 88.97 348.31 90.11C350.31 91.25 354.814 92.4367 361.82 93.67C368.86 94.9034 373.84 96.6234 376.76 98.83C379.68 101.037 381.144 105.183 381.15 111.27C381.15 117.363 379.194 121.83 375.28 124.67C371.367 127.51 365.657 128.933 358.15 128.94C353.25 128.94 336.89 127.12 336.89 127.12L337.37 119.42C346.77 120.32 353.56 120.99 358.15 120.99C362.74 120.99 366.23 120.26 368.64 118.8C371.05 117.34 372.25 114.89 372.25 111.45C372.25 108.01 371.25 105.68 369.17 104.45C367.09 103.22 362.61 102.06 355.66 100.95C348.71 99.84 343.76 98.22 340.84 96.09C337.92 93.96 336.45 90 336.45 84.23C336.45 78.46 338.45 74.23 342.56 71.43C346.67 68.63 351.71 67.28 357.79 67.28C362.61 67.28 379.34 68.51 379.34 68.51V76.26C370.51 75.87 363.29 75.24 358.24 75.24Z" fill="#1C1E23"/>
-<path d="M424 76.1801H405.15V104.52C405.15 111.313 405.643 115.777 406.63 117.91C407.63 120.05 409.97 121.11 413.68 121.11L424.23 120.4L424.83 127.75C420.835 128.489 416.79 128.926 412.73 129.06C406.57 129.06 402.303 127.557 399.93 124.55C397.557 121.543 396.373 115.813 396.38 107.36V76.1801H388V68.4801H396.42V50.3401H405.19V68.4801H424V76.1801Z" fill="#1C1E23"/>
-<path d="M436.36 60.9101V50.5901H445.25V60.9101H436.36ZM436.36 128.48V68.4801H445.25V128.48H436.36Z" fill="#1C1E23"/>
-<path d="M483.76 67.29C488.2 67.4795 492.622 67.9572 497 68.72L499.84 69.07L499.49 76.3C494.844 75.7114 490.172 75.3576 485.49 75.24C478.77 75.24 474.207 76.84 471.8 80.04C469.393 83.24 468.187 89.1667 468.18 97.82C468.18 106.487 469.307 112.513 471.56 115.9C473.813 119.287 478.513 120.987 485.66 121L499.66 119.94L500.02 127.29C494.57 128.213 489.065 128.768 483.54 128.95C474.3 128.95 467.92 126.577 464.4 121.83C460.88 117.083 459.12 109.083 459.12 97.83C459.12 86.57 461.017 78.6667 464.81 74.12C468.603 69.5734 474.92 67.2967 483.76 67.29Z" fill="#1C1E23"/>
-</g>
-<defs>
-<clipPath id="clip0_15_21">
-<rect width="500" height="171.38" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/src/Elastic.Markdown/_static/observability-logo-color-64px.svg b/src/Elastic.Markdown/_static/observability-logo-color-64px.svg
deleted file mode 100644
index 1445bc6a0..000000000
--- a/src/Elastic.Markdown/_static/observability-logo-color-64px.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_0_6372)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22 59H17.0906C10.966 59 6 54.0201 6 47.8785V32H22V59Z" fill="#F04E98"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22 59H38V19H22V59Z" fill="#343741"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59 59H43V6L46.5081 6.04052C53.4282 6.11868 59 12.18 59 19.6277V42.9611V59Z" fill="#0077CC"/>
-</g>
-<defs>
-<clipPath id="clip0_0_6372">
-<rect width="64" height="64" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/src/Elastic.Markdown/_static/security-logo-color-64px.svg b/src/Elastic.Markdown/_static/security-logo-color-64px.svg
deleted file mode 100644
index 8f41ec291..000000000
--- a/src/Elastic.Markdown/_static/security-logo-color-64px.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_0_6360)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20 17V4H56V34C56 41.0112 43.7467 45.6044 39 47V17H20Z" fill="#FA744E"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9 39.3984V22H34V60C34 60 9 49.5847 9 39.3984Z" fill="#00BFB3"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19 22H34V47C28.406 44.9626 19 40.292 19 34.4224V22Z" fill="#343741"/>
-</g>
-<defs>
-<clipPath id="clip0_0_6360">
-<rect width="64" height="64" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/src/docs-builder/Cli/Commands.cs b/src/docs-builder/Cli/Commands.cs
index 6e1b29bb7..aa2e3c624 100644
--- a/src/docs-builder/Cli/Commands.cs
+++ b/src/docs-builder/Cli/Commands.cs
@@ -74,12 +74,36 @@ public async Task<int> Generate(
 		pathPrefix ??= githubActionsService.GetInput("prefix");
 		var fileSystem = new FileSystem();
 		var collector = new ConsoleDiagnosticsCollector(logger, githubActionsService);
-		var context = new BuildContext(collector, fileSystem, fileSystem, path, output)
+
+		var runningOnCi = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"));
+		BuildContext context;
+		try
+		{
+			context = new BuildContext(collector, fileSystem, fileSystem, path, output)
+			{
+				UrlPathPrefix = pathPrefix,
+				Force = force ?? false,
+				AllowIndexing = allowIndexing != null
+			};
+		}
+		// On CI, we are running on merge commit which may have changes against an older
+		// docs folder (this can happen on out of date PR's).
+		// At some point in the future we can remove this try catch
+		catch (Exception e) when (runningOnCi && e.Message.StartsWith("Can not locate docset.yml file in"))
 		{
-			UrlPathPrefix = pathPrefix,
-			Force = force ?? false,
-			AllowIndexing = allowIndexing != null
-		};
+			var outputDirectory = !string.IsNullOrWhiteSpace(output)
+				? fileSystem.DirectoryInfo.New(output)
+				: fileSystem.DirectoryInfo.New(Path.Combine(Paths.Root.FullName, ".artifacts/docs/html"));
+			// we temporarily do not error when pointed to a non documentation folder.
+			_ = fileSystem.Directory.CreateDirectory(outputDirectory.FullName);
+
+			ConsoleApp.Log($"Skipping build as we are running on a merge commit and the docs folder is out of date and has no docset.yml. {e.Message}");
+
+			await githubActionsService.SetOutputAsync("skip", "true");
+			return 0;
+		}
+		if (runningOnCi)
+			await githubActionsService.SetOutputAsync("skip", "false");
 		var set = new DocumentationSet(context, logger);
 		var generator = new DocumentationGenerator(set, logger);
 		await generator.GenerateAll(ctx);
diff --git a/src/docs-builder/Http/DocumentationWebHost.cs b/src/docs-builder/Http/DocumentationWebHost.cs
index e8c66cab1..eacec3eac 100644
--- a/src/docs-builder/Http/DocumentationWebHost.cs
+++ b/src/docs-builder/Http/DocumentationWebHost.cs
@@ -75,59 +75,6 @@ public async Task StopAsync(Cancel ctx)
 	private void SetUpRoutes()
 	{
 		_ = _webApplication
-			.UseExceptionHandler(options =>
-			{
-				options.Run(async context =>
-				{
-					try
-					{
-						var exception = context.Features.Get<Microsoft.AspNetCore.Diagnostics.IExceptionHandlerFeature>();
-						if (exception != null)
-						{
-							var logger = context.RequestServices.GetRequiredService<ILogger<DocumentationWebHost>>();
-							logger.LogError(
-								exception.Error,
-								"Unhandled exception processing request {Path}. Error: {Error}\nStack Trace: {StackTrace}\nInner Exception: {InnerException}",
-								context.Request.Path,
-								exception.Error.Message,
-								exception.Error.StackTrace,
-								exception.Error.InnerException?.ToString() ?? "None"
-							);
-							logger.LogError(
-								"Request Details - Method: {Method}, Path: {Path}, QueryString: {QueryString}",
-								context.Request.Method,
-								context.Request.Path,
-								context.Request.QueryString
-							);
-
-							context.Response.StatusCode = 500;
-							context.Response.ContentType = "text/html";
-							await context.Response.WriteAsync(@"
-								<html>
-									<head><title>Error</title></head>
-									<body>
-										<h1>Internal Server Error</h1>
-										<p>An error occurred while processing your request.</p>
-										<p>Please check the application logs for more details.</p>
-									</body>
-								</html>");
-						}
-					}
-					catch (Exception handlerEx)
-					{
-						var logger = context.RequestServices.GetRequiredService<ILogger<DocumentationWebHost>>();
-						logger.LogCritical(
-							handlerEx,
-							"Error handler failed to process exception. Handler Error: {Error}\nStack Trace: {StackTrace}",
-							handlerEx.Message,
-							handlerEx.StackTrace
-						);
-						context.Response.StatusCode = 500;
-						context.Response.ContentType = "text/plain";
-						await context.Response.WriteAsync("A critical error occurred.");
-					}
-				});
-			})
 			.UseLiveReload()
 			.UseStaticFiles(
 				new StaticFileOptions
diff --git a/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs b/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs
index 47a72afc0..f0421e934 100644
--- a/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs
@@ -83,7 +83,7 @@ public virtual async ValueTask InitializeAsync()
 
 		await Set.LinkResolver.FetchLinks();
 		Document = await File.ParseFullAsync(default);
-		var html = File.CreateHtml(Document).AsSpan();
+		var html = MarkdownFile.CreateHtml(Document).AsSpan();
 		var find = "</section>";
 		var start = html.IndexOf(find, StringComparison.Ordinal);
 		Html = start >= 0
diff --git a/tests/Elastic.Markdown.Tests/Inline/AnchorLinkTests.cs b/tests/Elastic.Markdown.Tests/Inline/AnchorLinkTests.cs
index 309545177..526cd281b 100644
--- a/tests/Elastic.Markdown.Tests/Inline/AnchorLinkTests.cs
+++ b/tests/Elastic.Markdown.Tests/Inline/AnchorLinkTests.cs
@@ -75,7 +75,7 @@ [Sub Requirements](testing/req.md#sub-requirements)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/docs/testing/req#sub-requirements" hx-get="/docs/testing/req#sub-requirements" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Sub Requirements</a></p>"""
+			"""<p><a href="/docs/testing/req#sub-requirements" hx-get="/docs/testing/req#sub-requirements" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Sub Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -93,7 +93,7 @@ [Sub Requirements](testing/req.md#new-reqs)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/docs/testing/req#new-reqs" hx-get="/docs/testing/req#new-reqs" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Sub Requirements</a></p>"""
+			"""<p><a href="/docs/testing/req#new-reqs" hx-get="/docs/testing/req#new-reqs" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Sub Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -110,7 +110,7 @@ public class ExternalPageAnchorAutoTitleTests(ITestOutputHelper output) : Anchor
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/docs/testing/req#sub-requirements" hx-get="/docs/testing/req#sub-requirements" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Special Requirements &gt; Sub Requirements</a></p>"""
+			"""<p><a href="/docs/testing/req#sub-requirements" hx-get="/docs/testing/req#sub-requirements" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Special Requirements &gt; Sub Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -146,7 +146,7 @@ [Sub Requirements](testing/req.md#sub-requirements2)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/docs/testing/req#sub-requirements2" hx-get="/docs/testing/req#sub-requirements2" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Sub Requirements</a></p>"""
+			"""<p><a href="/docs/testing/req#sub-requirements2" hx-get="/docs/testing/req#sub-requirements2" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Sub Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -165,7 +165,7 @@ [Heading inside dropdown](testing/req.md#heading-inside-dropdown)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<a href="/docs/testing/req#heading-inside-dropdown" hx-get="/docs/testing/req#heading-inside-dropdown" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Heading inside dropdown</a>"""
+			"""<a href="/docs/testing/req#heading-inside-dropdown" hx-get="/docs/testing/req#heading-inside-dropdown" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Heading inside dropdown</a>"""
 		);
 	[Fact]
 	public void HasError() => Collector.Diagnostics.Should().HaveCount(0);
diff --git a/tests/Elastic.Markdown.Tests/Inline/DirectiveBlockLinkTests.cs b/tests/Elastic.Markdown.Tests/Inline/DirectiveBlockLinkTests.cs
index 6d570c2c0..d5549f6c2 100644
--- a/tests/Elastic.Markdown.Tests/Inline/DirectiveBlockLinkTests.cs
+++ b/tests/Elastic.Markdown.Tests/Inline/DirectiveBlockLinkTests.cs
@@ -66,7 +66,7 @@ [Sub Requirements](testing/req.md#hint_ref)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/docs/testing/req#hint_ref" hx-get="/docs/testing/req#hint_ref" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Sub Requirements</a></p>"""
+			"""<p><a href="/docs/testing/req#hint_ref" hx-get="/docs/testing/req#hint_ref" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Sub Requirements</a></p>"""
 		);
 
 	[Fact]
diff --git a/tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs
index f5c95cae2..df6669b9b 100644
--- a/tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs
+++ b/tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs
@@ -200,7 +200,7 @@ [Sub Requirements](testing/req.md#custom-anchor)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/docs/testing/req#custom-anchor" hx-get="/docs/testing/req#custom-anchor" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Sub Requirements</a></p>"""
+			"""<p><a href="/docs/testing/req#custom-anchor" hx-get="/docs/testing/req#custom-anchor" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Sub Requirements</a></p>"""
 		);
 
 	[Fact]
diff --git a/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs
index 999ac3656..c7d08cb01 100644
--- a/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs
+++ b/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs
@@ -41,7 +41,7 @@ public class InlineLinkTests(ITestOutputHelper output) : LinkTestBase(output,
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/docs/_static/img/observability.png" hx-get="/docs/_static/img/observability.png" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Elasticsearch</a></p>"""
+			"""<p><a href="/docs/_static/img/observability.png" hx-get="/docs/_static/img/observability.png" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Elasticsearch</a></p>"""
 		);
 
 	[Fact]
@@ -58,7 +58,7 @@ public class LinkToPageTests(ITestOutputHelper output) : LinkTestBase(output,
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/docs/testing/req" hx-get="/docs/testing/req" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Requirements</a></p>"""
+			"""<p><a href="/docs/testing/req" hx-get="/docs/testing/req" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -78,7 +78,7 @@ public class InsertPageTitleTests(ITestOutputHelper output) : LinkTestBase(outpu
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/docs/testing/req" hx-get="/docs/testing/req" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Special Requirements</a></p>"""
+			"""<p><a href="/docs/testing/req" hx-get="/docs/testing/req" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Special Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -100,7 +100,7 @@ public class LinkReferenceTest(ITestOutputHelper output) : LinkTestBase(output,
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/docs/testing/req" hx-get="/docs/testing/req" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">test</a></p>"""
+			"""<p><a href="/docs/testing/req" hx-get="/docs/testing/req" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">test</a></p>"""
 		);
 
 	[Fact]
@@ -231,10 +231,10 @@ public void GeneratesHtml() =>
 		Html.TrimEnd().Should().Be("""
 		<p>Links:</p>
 		<ul>
-		<li><a href="/docs/testing/req" hx-get="/docs/testing/req" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Special Requirements</a></li>
+		<li><a href="/docs/testing/req" hx-get="/docs/testing/req" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Special Requirements</a></li>
 		</ul>
 		<ul>
-		<li><a href="/docs/testing/req" hx-get="/docs/testing/req" hx-select-oob="#primary-nav,#secondary-nav,#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="true">Special Requirements</a></li>
+		<li><a href="/docs/testing/req" hx-get="/docs/testing/req" hx-select-oob="#markdown-content,#toc-nav,#prev-next-nav,#breadcrumbs" hx-swap="none" hx-push-url="true" hx-indicator="#htmx-indicator" preload="mouseover">Special Requirements</a></li>
 		</ul>
 		""");
 
diff --git a/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs
index 700c51004..2ef781cd7 100644
--- a/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs
+++ b/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs
@@ -129,7 +129,7 @@ public virtual async ValueTask InitializeAsync()
 		await Set.LinkResolver.FetchLinks();
 
 		Document = await File.ParseFullAsync(default);
-		var html = File.CreateHtml(Document).AsSpan();
+		var html = MarkdownFile.CreateHtml(Document).AsSpan();
 		var find = "</h1>\n</section>";
 		var start = html.IndexOf(find, StringComparison.Ordinal);
 		Html = start >= 0 && !TestingFullDocument