diff --git a/Havit.Blazor.Components.Web.Bootstrap.Documentation/Pages/Components/HxButtonDoc/HxButton_Documentation.razor b/Havit.Blazor.Components.Web.Bootstrap.Documentation/Pages/Components/HxButtonDoc/HxButton_Documentation.razor
index 22d53446..a667d55b 100644
--- a/Havit.Blazor.Components.Web.Bootstrap.Documentation/Pages/Components/HxButtonDoc/HxButton_Documentation.razor
+++ b/Havit.Blazor.Components.Web.Bootstrap.Documentation/Pages/Components/HxButtonDoc/HxButton_Documentation.razor
@@ -27,10 +27,10 @@
     <SectionTitle Id="on-valid-click-with-spinner" Level="1">OnValidClick with spinner</SectionTitle>
     <Demo Type="typeof(HxButton_Demo_OnValidClickWithSpinner)" />
 
-    <SectionTitle Id="manual-spinner" Level="1">Manual Spinner</SectionTitle>
+    <SectionTitle Id="manual-spinner" Level="2">Manual Spinner</SectionTitle>
     <Demo Type="typeof(HxButton_Demo_ManualSpinner)" />
 
-    <SectionTitle Id="spinner-and-single-click-protection" Level="1">Spinner &amp; Single click protection</SectionTitle>
+    <SectionTitle Id="spinner-and-single-click-protection" Level="3">Spinner &amp; Single click protection</SectionTitle>
     <DocAlert Type="DocAlertType.Warning">
         EditForm's <code>OnSubmit</code> events are not captured for spinner automation. Use HxButton's <code>OnClick</code>, <code>OnValidClick</code> and <code>OnInvalidClick</code> instead.
     </DocAlert>
diff --git a/Havit.Blazor.Components.Web.Bootstrap.Documentation/Shared/Components/OnThisPageNavigation.razor.cs b/Havit.Blazor.Components.Web.Bootstrap.Documentation/Shared/Components/OnThisPageNavigation.razor.cs
index 4f5d519b..826af8a7 100644
--- a/Havit.Blazor.Components.Web.Bootstrap.Documentation/Shared/Components/OnThisPageNavigation.razor.cs
+++ b/Havit.Blazor.Components.Web.Bootstrap.Documentation/Shared/Components/OnThisPageNavigation.razor.cs
@@ -49,13 +49,20 @@ private RenderFragment GenerateSectionTree() => builder =>
 			SectionTitle currentSection = Sections.ElementAt(i);
 
 			// Handle level adjustments - nested lists.
+			int levelDifference = Math.Abs(currentSection.Level - currentLevel);
 			if (currentSection.Level > currentLevel)
 			{
-				builder.OpenElement(sequence++, "ul");
+				for (int j = 0; j < levelDifference; j++)
+				{
+					builder.OpenElement(sequence++, "ul");
+				}
 			}
 			else if (currentSection.Level < currentLevel)
 			{
-				builder.CloseElement();
+				for (int j = 0; j < levelDifference; j++)
+				{
+					builder.CloseElement();
+				}
 			}
 			currentLevel = currentSection.Level;