diff --git a/src/main/resources/static/js/languageSelection.js b/src/main/resources/static/js/languageSelection.js
index 383d23da..2c7e0406 100644
--- a/src/main/resources/static/js/languageSelection.js
+++ b/src/main/resources/static/js/languageSelection.js
@@ -1,5 +1,5 @@
 function getStoredOrDefaultLocale() {
-  const storedLocale = localStorage.getItem("languageCode");
+  const storedLocale = localStorage.getItem('languageCode');
   return storedLocale || getDetailedLanguageCode();
 }
 
@@ -7,10 +7,10 @@ function setLanguageForDropdown(dropdownClass) {
   const storedLocale = getStoredOrDefaultLocale();
   const dropdownItems = document.querySelectorAll(dropdownClass);
 
-  dropdownItems.forEach(item => {
-      item.classList.toggle("active", item.dataset.bsLanguageCode === storedLocale);
-      item.removeEventListener("click", handleDropdownItemClick);
-      item.addEventListener("click", handleDropdownItemClick);
+  dropdownItems.forEach((item) => {
+    item.classList.toggle('active', item.dataset.bsLanguageCode === storedLocale);
+    item.removeEventListener('click', handleDropdownItemClick);
+    item.addEventListener('click', handleDropdownItemClick);
   });
 }
 
@@ -24,62 +24,46 @@ function handleDropdownItemClick(event) {
   event.preventDefault();
   const languageCode = event.currentTarget.dataset.bsLanguageCode;
   if (languageCode) {
-      localStorage.setItem("languageCode", languageCode);
-      updateUrlWithLanguage(languageCode);
+    localStorage.setItem('languageCode', languageCode);
+    updateUrlWithLanguage(languageCode);
   } else {
-      console.error("Language code is not set for this item.");
+    console.error('Language code is not set for this item.');
   }
 }
 
 function checkUserLanguage(defaultLocale) {
-  if (!localStorage.getItem("languageCode") || document.documentElement.getAttribute("data-language") != defaultLocale) {
-      localStorage.setItem("languageCode", defaultLocale);
-      updateUrlWithLanguage(defaultLocale);
+  if (
+    !localStorage.getItem('languageCode') ||
+    document.documentElement.getAttribute('data-language') != defaultLocale
+  ) {
+    localStorage.setItem('languageCode', defaultLocale);
+    updateUrlWithLanguage(defaultLocale);
   }
 }
 
 function initLanguageSettings() {
-  document.addEventListener("DOMContentLoaded", function () {
-      setLanguageForDropdown(".lang_dropdown-item");
+  document.addEventListener('DOMContentLoaded', function () {
+    setLanguageForDropdown('.lang_dropdown-item');
 
-      const defaultLocale = getStoredOrDefaultLocale();
-      checkUserLanguage(defaultLocale);
+    const defaultLocale = getStoredOrDefaultLocale();
+    checkUserLanguage(defaultLocale);
 
-      const dropdownItems = document.querySelectorAll(".lang_dropdown-item");
-      dropdownItems.forEach(item => {
-          item.classList.toggle("active", item.dataset.bsLanguageCode === defaultLocale);
-      });
-  });
-}
-
-function removeElements() {
-  document.addEventListener("DOMContentLoaded", function () {
-      document.querySelectorAll(".navbar-item").forEach((element) => {
-          const dropdownItems = element.querySelectorAll(".dropdown-item");
-          const items = Array.from(dropdownItems).filter(item => !item.querySelector("hr.dropdown-divider"));
-
-          if (items.length <= 2) {
-              if (
-                  element.previousElementSibling &&
-                  element.previousElementSibling.classList.contains("navbar-item") &&
-                  element.previousElementSibling.classList.contains("nav-item-separator")
-              ) {
-                  element.previousElementSibling.remove();
-              }
-              element.remove();
-          }
-      });
+    const dropdownItems = document.querySelectorAll('.lang_dropdown-item');
+    dropdownItems.forEach((item) => {
+      item.classList.toggle('active', item.dataset.bsLanguageCode === defaultLocale);
+    });
   });
 }
 
 function sortLanguageDropdown() {
-  document.addEventListener("DOMContentLoaded", function () {
-      const dropdownMenu = document.querySelector('.dropdown-menu .dropdown-item.lang_dropdown-item').parentElement;
-      if (dropdownMenu) {
-        const items = Array.from(dropdownMenu.children).filter(child => child.matches('a'));
-        items.sort((a, b) => a.dataset.bsLanguageCode.localeCompare(b.dataset.bsLanguageCode))
-          .forEach(node => dropdownMenu.appendChild(node));
-      }
+  document.addEventListener('DOMContentLoaded', function () {
+    const dropdownMenu = document.querySelector('.dropdown-menu .dropdown-item.lang_dropdown-item').parentElement;
+    if (dropdownMenu) {
+      const items = Array.from(dropdownMenu.children).filter((child) => child.matches('a'));
+      items
+        .sort((a, b) => a.dataset.bsLanguageCode.localeCompare(b.dataset.bsLanguageCode))
+        .forEach((node) => dropdownMenu.appendChild(node));
+    }
   });
 }
 
diff --git a/src/main/resources/static/js/navbar.js b/src/main/resources/static/js/navbar.js
new file mode 100644
index 00000000..de8509ad
--- /dev/null
+++ b/src/main/resources/static/js/navbar.js
@@ -0,0 +1,19 @@
+function removeElements() {
+  document.addEventListener('DOMContentLoaded', function () {
+    document.querySelectorAll('.navbar-item').forEach((element) => {
+      const dropdownItems = element.querySelectorAll('.dropdown-item');
+      const items = Array.from(dropdownItems).filter((item) => !item.querySelector('hr.dropdown-divider'));
+
+      if (items.length == 0) {
+        if (
+          element.previousElementSibling &&
+          element.previousElementSibling.classList.contains('navbar-item') &&
+          element.previousElementSibling.classList.contains('nav-item-separator')
+        ) {
+          element.previousElementSibling.remove();
+        }
+        element.remove();
+      }
+    });
+  });
+}
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index d3206433..f4b9de0a 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -1,5 +1,6 @@
 <div th:fragment="navbar" class="mx-auto">
   <script th:src="@{'/js/languageSelection.js'}"></script>
+  <script th:src="@{'/js/navbar.js'}"></script>
   <script th:src="@{'/js/additionalLanguageCode.js'}"></script>
   <script th:inline="javascript">
     // Initializing the scripts
@@ -81,8 +82,9 @@
                           th:replace="~{fragments/navbarEntry :: navbarEntry ('pdf-to-single-page', 'looks_one', 'home.PdfToSinglePage.title', 'home.PdfToSinglePage.desc', 'PdfToSinglePage.tags', 'organize')}">
                         </div>
                       </div>
+                      <div class="navbar-item col-lg-2 col-sm-6 py px-xl-1 px-2"style="display:flex; flex-direction: column;">
                       <!-- Convert to PDF menu items -->
-                      <div class="navbar-item col-lg-2 col-sm-6 py px-xl-1 px-2">
+                      <div class="navbar-item py px-xl-1 px-2">
                         <h6 class="menu-title" th:text="#{navbar.sections.convertTo}"></h6>
                         <div
                           th:replace="~{fragments/navbarEntry :: navbarEntry ('img-to-pdf', 'image', 'home.imageToPdf.title', 'home.imageToPdf.desc', 'imageToPdf.tags', 'image')}">
@@ -99,12 +101,12 @@
                         <div
                           th:replace="~{fragments/navbarEntry :: navbarEntry ('markdown-to-pdf', 'markdown', 'home.MarkdownToPDF.title', 'home.MarkdownToPDF.desc', 'MarkdownToPDF.tags', 'convert')}">
                         </div>
-                         <div
+                        <div
                           th:replace="~{fragments/navbarEntry :: navbarEntry ('book-to-pdf', 'book', 'home.BookToPDF.title', 'home.BookToPDF.desc', 'BookToPDF.tags', 'convert')}">
                         </div>
                       </div>
                       <!-- Convert from PDF menu items -->
-                      <div class="navbar-item col-lg-2 col-sm-6 py px-xl-1 px-2">
+                      <div class="navbar-item py px-xl-1 px-2" style="margin-top: 1rem;">
                         <h6 class="menu-title" th:text="#{navbar.sections.convertFrom}"></h6>
                         <div
                           th:replace="~{fragments/navbarEntry :: navbarEntry ('pdf-to-img', 'image', 'home.pdfToImage.title', 'home.pdfToImage.desc', 'pdfToImage.tags', 'image')}">
@@ -134,6 +136,7 @@
                           th:replace="~{fragments/navbarEntry :: navbarEntry ('pdf-to-book', 'book', 'home.PDFToBook.title', 'home.PDFToBook.desc', 'PDFToBook.tags', 'convert')}">
                         </div>
                       </div>
+                    </div>
                       <!-- Security menu items -->
                       <div class="navbar-item col-lg-2 col-sm-6 py px-xl-1 px-2">
                         <h6 class="menu-title" th:text="#{navbar.sections.security}"></h6>