diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java
index a784b0f39..7d4b2e3c9 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java
@@ -67,7 +67,7 @@ public class StampController {
         if (pdfFileName.contains("..") || pdfFileName.startsWith("/")) {
             throw new IllegalArgumentException("Invalid PDF file path");
         }
-        
+
         String stampType = request.getStampType();
         String stampText = request.getStampText();
         MultipartFile stampImage = request.getStampImage();
diff --git a/app/core/src/main/resources/static/css/navbar.css b/app/core/src/main/resources/static/css/navbar.css
index 047957b6d..20cd19176 100644
--- a/app/core/src/main/resources/static/css/navbar.css
+++ b/app/core/src/main/resources/static/css/navbar.css
@@ -251,6 +251,13 @@ html[dir="rtl"] .lang-dropdown-item-wrapper {
   border-left: 2px solid var(--md-nav-color-on-separator);
 }
 
+.scroll-lock-y {
+  overflow-y: auto;
+  max-height: 30vh;
+  overscroll-behavior-y: contain;
+  -webkit-overflow-scrolling: touch;
+}
+
 /* Responsive adjustments */
 @media (min-width: 1200px) {
   .lang-dropdown-item-wrapper .dropdown-item {
@@ -258,14 +265,10 @@ html[dir="rtl"] .lang-dropdown-item-wrapper {
 }
 
 .scroll-lock-y {
-  overflow-y: auto;
   max-height: 80vh;
-  overscroll-behavior-y: contain;
-  -webkit-overflow-scrolling: touch;
 }
 }
 
-
 .dropdown-item .icon-text {
   text-wrap: wrap;
   word-break: break-word;
diff --git a/app/core/src/main/resources/templates/fragments/common.html b/app/core/src/main/resources/templates/fragments/common.html
index 78f0d5662..d3b888a1d 100644
--- a/app/core/src/main/resources/templates/fragments/common.html
+++ b/app/core/src/main/resources/templates/fragments/common.html
@@ -115,7 +115,7 @@
       
       // Set CSS custom property for mobile navbar scaling (for sidebar positioning)
       // Use the ACTUAL scaled height, not a fixed assumption
-      const baseHeight = 60;
+      const baseHeight = 64;
       const actualScaledHeight = baseHeight * navScale;
       document.documentElement.style.setProperty('--navbar-height', `${actualScaledHeight}px`);
       
@@ -200,8 +200,8 @@
   <link rel="stylesheet" th:href="@{'/css/footer.css'}">
 
   <link rel="preload" th:href="@{'/fonts/google-symbol.woff2'}" as="font" type="font/woff2" crossorigin="anonymous">
-  <link rel="stylesheet" th:href="@{'/css/cookieconsent.css'}">
-  <link rel="stylesheet" th:href="@{'/css/cookieconsentCustomisation.css'}">
+  <link rel="stylesheet" th:href="@{'/css/cookieconsent.css'}" th:if="${@analyticsEnabled}">
+  <link rel="stylesheet" th:href="@{'/css/cookieconsentCustomisation.css'}" th:if="${@analyticsEnabled}">
   <script th:src="@{'/js/thirdParty/fontfaceobserver.standalone.js'}"></script>
 
   <!-- Google MD Icons -->
diff --git a/app/core/src/main/resources/templates/fragments/footer.html b/app/core/src/main/resources/templates/fragments/footer.html
index 2d8465bf5..89c3c78b1 100644
--- a/app/core/src/main/resources/templates/fragments/footer.html
+++ b/app/core/src/main/resources/templates/fragments/footer.html
@@ -1,6 +1,6 @@
 <footer th:fragment="footer" id="footer" class="text-center">
   
-  <script type="module" th:src="@{'/js/thirdParty/cookieconsent-config.js'}"></script>
+  <script type="module" th:src="@{'/js/thirdParty/cookieconsent-config.js'}" th:if="${@analyticsEnabled}"></script>
   <div class="footer-center">
     <!-- Links section -->
     <div class="d-flex justify-content-center">
@@ -13,7 +13,7 @@
         <li th:if="${@accessibilityStatement != ''}"><a class="footer-link px-2" target="_blank" th:href="${@accessibilityStatement}" th:text="#{legal.accessibility}">accessibilityStatement</a></li>
         <li th:if="${@cookiePolicy != ''}"><a class="footer-link px-2" target="_blank" th:href="${@cookiePolicy}" th:text="#{legal.cookie}">cookiePolicy</a></li>
         <li th:if="${@impressum != ''}"><a class="footer-link px-2" target="_blank" th:href="${@impressum}" th:text="#{legal.impressum}">impressum</a></li>
-        <li><a class="footer-link px-2" id="cookieBanner" target="_blank"  th:text="#{legal.showCookieBanner}" onClick="CookieConsent.show(true)">Cookie Preferences</a></li>
+        <li th:if="${@analyticsEnabled}"><a class="footer-link px-2" id="cookieBanner" target="_blank"  th:text="#{legal.showCookieBanner}" onClick="CookieConsent.show(true)">Cookie Preferences</a></li>
       </ul>
     </div>
 
diff --git a/app/core/src/main/resources/templates/fragments/navbar.html b/app/core/src/main/resources/templates/fragments/navbar.html
index 773810a5a..e5aea9345 100644
--- a/app/core/src/main/resources/templates/fragments/navbar.html
+++ b/app/core/src/main/resources/templates/fragments/navbar.html
@@ -163,7 +163,7 @@
               <span class="material-symbols-rounded chevron-icon">expand_more</span>
             </a>
             <div class="dropdown-menu dropdown-menu-tp" aria-labelledby="searchDropdown">
-              <div class="dropdown-menu-wrapper px-xl-2 px-2 scroll-lock-y" style="max-width: 95vw !important;">
+              <div class="dropdown-menu-wrapper px-xl-2 px-2" style="max-width: 95vw !important;">
                 <form th:action="@{''}" class="d-flex p-2 search-form" id="searchForm">
                   <input class="form-control search-input" type="search" th:placeholder="#{navbar.search}"
                     aria-label="Search" id="navbarSearchInput">