diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/DemosPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/DemosPage.razor
index 12b5e7aa7e..ea82dc1bea 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/DemosPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/DemosPage.razor
@@ -50,7 +50,7 @@
 
         <br /><br /><br />
 
-        <BitText Typography="BitTypography.H4" Gutter>Boilerplate</BitText>
+        <BitText id="boilerplate" Style="scroll-margin-top:100px" Typography="BitTypography.H4" Gutter>Boilerplate</BitText>
         <BitText Gutter>
             The bit Boilerplate is a feature-packed project template that accelerates your development. Watch the video to see its built-in capabilities in action.
         </BitText>
@@ -77,7 +77,7 @@
 
         <br /><br /><br /><br />
 
-        <BitText Typography="BitTypography.H4" Gutter>AdminPanel</BitText>
+        <BitText id="adminpanel" Style="scroll-margin-top:100px" Typography="BitTypography.H4" Gutter>AdminPanel</BitText>
         <div class="page-flex-container">
             <div class="page-content-container">
                 <img class="template-img dark-image" src="/images/demos/admin-dark.webp" alt="AdminPanel sample" />
@@ -96,7 +96,7 @@
             </div>
         </div>
 
-        <BitText Typography="BitTypography.H4" Gutter>Sales (still shaping up)</BitText>
+        <BitText id="sales" Style="scroll-margin-top:100px" Typography="BitTypography.H4" Gutter>Sales (still shaping up)</BitText>
         <div class="page-flex-container">
             <div class="page-content-container">
                 <img class="template-img dark-image" src="/images/demos/sales-dark.webp" alt="Sales sample" />
@@ -114,7 +114,7 @@
             </div>
         </div>
 
-        <BitText Typography="BitTypography.H4" Gutter>Todo</BitText>
+        <BitText id="todo" Style="scroll-margin-top:100px" Typography="BitTypography.H4" Gutter>Todo</BitText>
         <div class="page-flex-container">
             <div class="page-content-container">
                 <img class="template-img dark-image" src="/images/demos/todo-dark.webp" alt="Todo sample" />
@@ -133,7 +133,7 @@
             </div>
         </div>
 
-        <BitText Typography="BitTypography.H4" Gutter>Platform website</BitText>
+        <BitText id="platform" Style="scroll-margin-top:100px" Typography="BitTypography.H4" Gutter>Platform website</BitText>
         <div class="page-flex-container">
             <div class="page-content-container">
                 <img class="template-img dark-image" src="/images/demos/platform-dark.webp" alt="bitplatform website" />
@@ -149,7 +149,7 @@
             </div>
         </div>
 
-        <BitText Typography="BitTypography.H4" Gutter>BlazorUI</BitText>
+        <BitText id="blazorui" Style="scroll-margin-top:100px" Typography="BitTypography.H4" Gutter>BlazorUI</BitText>
         <div class="page-flex-container">
             <div class="page-content-container">
                 <img class="template-img dark-image" src="/images/demos/blazorui-dark.webp" alt="BlazorUI sample" />
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/MainLayout.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/MainLayout.razor.cs
index 5b4799c663..5fb6ff562d 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/MainLayout.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/MainLayout.razor.cs
@@ -98,11 +98,11 @@ private void SetNavItems()
     {
         var currentUrl = navigationManager.Uri.Replace(navigationManager.BaseUri, "/", StringComparison.InvariantCultureIgnoreCase);
 
-        isTemplateDocRoute = currentUrl.Contains("templates") || currentUrl.Contains("boilerplate");
-        isBswupDocRoute = currentUrl.Contains("bswup");
-        isBesqlDocRoute = currentUrl.Contains("besql");
-        isButilDocRoute = currentUrl.Contains("butil");
-        isLcncDocRoute = currentUrl.Contains("lowcode-nocode");
+        isTemplateDocRoute = currentUrl.Contains("/templates") || currentUrl.Contains("/boilerplate");
+        isBswupDocRoute = currentUrl.Contains("/bswup");
+        isBesqlDocRoute = currentUrl.Contains("/besql");
+        isButilDocRoute = currentUrl.Contains("/butil");
+        isLcncDocRoute = currentUrl.Contains("/lowcode-nocode");
         isDocsRoute = isTemplateDocRoute || isBswupDocRoute || isBesqlDocRoute || isButilDocRoute /*|| isLcncDocRoute*/;
 
         navItems = isTemplateDocRoute ? templatesNavItems