diff --git a/build.gradle b/build.gradle
index 014c10b7..db9ef850 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ ext {
 }
 
 group = "stirling.software"
-version = "0.45.3"
+version = "0.45.4"
 
 java {
     // 17 is lowest but we support and recommend 21
diff --git a/src/main/resources/static/css/navbar.css b/src/main/resources/static/css/navbar.css
index e1d2ad49..f9b3f307 100644
--- a/src/main/resources/static/css/navbar.css
+++ b/src/main/resources/static/css/navbar.css
@@ -89,6 +89,22 @@
   grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); /* Auto-fill columns, with a minimum width of 180px */
 }
 
+.scalable-languages-container:not(:has(> :nth-child(4))) .lang-dropdown-item-wrapper:last-child {
+  border: 0px !important
+}
+
+.scalable-languages-container:has(> *:nth-child(1)) {
+  --count: 1;
+}
+
+.scalable-languages-container:has(> *:nth-child(2)) {
+  --count: 2;
+}
+
+.scalable-languages-container:has(> *:nth-child(3)) {
+  --count: 3;
+}
+
 html[dir="ltr"] .lang-dropdown-item-wrapper {
   border-right: 2px solid var(--md-nav-color-on-seperator);
 }
@@ -99,8 +115,8 @@ html[dir="rtl"] .lang-dropdown-item-wrapper {
 
 /* Responsive adjustments */
 @media (min-width: 1200px){
-  .lang_dropdown-mw{
-    min-width: 800px
+  .lang-dropdown-item-wrapper .dropdown-item {
+    min-width: 200px
   }
 }
 
@@ -108,7 +124,9 @@ html[dir="rtl"] .lang-dropdown-item-wrapper {
   .scalable-languages-container {
     grid-template-columns: repeat(2, 1fr);
   }
-
+  .scalable-languages-container:not(:has(> :nth-child(2))){
+    grid-template-columns: repeat(var(--count), 1fr) !important;
+  }
   .scalable-languages-container .lang-dropdown-item-wrapper:nth-child(2n) {
     border: 0px
   }
@@ -118,15 +136,23 @@ html[dir="rtl"] .lang-dropdown-item-wrapper {
   .scalable-languages-container {
     grid-template-columns: repeat(3, 1fr);
   }
+  .scalable-languages-container:not(:has(> :nth-child(3))){
+    grid-template-columns: repeat(var(--count), 1fr) !important;
+  }
   .scalable-languages-container .lang-dropdown-item-wrapper:nth-child(3n) {
     border: 0px
+  }
 }
-}
+
 @media (min-width: 901px) {
   .scalable-languages-container {
     grid-template-columns: repeat(4, 1fr);
   }
 
+  .scalable-languages-container:not(:has(> :nth-child(4))){
+    grid-template-columns: repeat(var(--count), 1fr) !important;
+  }
+
   .scalable-languages-container .lang-dropdown-item-wrapper:nth-child(4n) {
       border: 0px
   }
@@ -215,13 +241,13 @@ span.icon-text::after {
 
 .dropdown-menu.scrollable-y {
   overflow-y: scroll;
-  height: 360px;
+  max-height: 360px;
 }
 
 /* Dropdown Scrollbar*/
 .scrollable-y {
   overflow-y: scroll;
-  height: 190px;
+  max-height: 190px;
   overscroll-behavior: contain;
 }
 
diff --git a/src/main/resources/templates/fragments/languageEntry.html b/src/main/resources/templates/fragments/languageEntry.html
index 410b6a6c..18a976ba 100644
--- a/src/main/resources/templates/fragments/languageEntry.html
+++ b/src/main/resources/templates/fragments/languageEntry.html
@@ -1,6 +1,6 @@
 <th:block th:fragment="languageEntry(code, name)">
-  <div class="lang-dropdown-item-wrapper">
-      <a th:if="${code} == 'en_GB' or ${#lists.isEmpty(@languages) or #lists.contains(@languages, code)}"
+  <div th:if="${code} == 'en_GB' or ${#lists.isEmpty(@languages) or #lists.contains(@languages, code)}" class="lang-dropdown-item-wrapper">
+      <a 
         class="dropdown-item lang_dropdown-item" href="" th:data-bs-language-code="@{${code}}" th:text="${name}">
       </a>
   </div>