diff --git a/templates/page.tmpl b/templates/page.tmpl
index 7a6cb06..d4e868a 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -42,19 +42,19 @@
 
     <nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light border">
       <div class="container-fluid">
-	      <a class="navbar-brand" href="<TMPL_VAR BASEURL>">
+	      <a class="navbar-brand me-auto" href="<TMPL_VAR BASEURL>">
             <img alt="<TMPL_VAR WIKINAME>" src="<TMPL_VAR BASEURL>favicon.png" width="48" height="48" />
           </a>
 
           <TMPL_IF OTHERLANGUAGES>
-		  <div class="dropdown">
+		  <div class="dropdown ps-2 pe-2">
 		   <button class="btn language-switcher dropdown" type="button" id="language-menu-top" data-bs-toggle="dropdown" aria-expanded="false">
-		   	<div class="collapse navbar-collapse float-start me-1" id="navbar"> 
+		   	<div class="collapse navbar-collapse float-end ms-1" id="navbar"> 
              <TMPL_VAR LANG_NAME>
 			 </div>
 			 <img src="<TMPL_VAR BASEURL>wikiicons/languages.png">
 		   </button>
-		   <ul class="dropdown-menu" aria-labelledby="language-menu-top">
+		   <ul class="dropdown-menu dropdown-menu-end dropdown-menu-lg-start" aria-labelledby="language-menu-top">
               <TMPL_LOOP OTHERLANGUAGES>
               <li>
 			  <a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
@@ -69,7 +69,7 @@
           </div>
           </TMPL_IF>
 
-		  <button class="navbar-toggler collapsed ms-auto" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbarScroll" aria-expanded="false" aria-label="Toggle navigation">
+		  <button class="navbar-toggler collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbarScroll" aria-expanded="false" aria-label="Toggle navigation">
 		    <span class="navbar-toggler-icon"></span>
           </button>