diff --git a/templates/page.tmpl b/templates/page.tmpl
index 1863d5b..6aae77f 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -25,7 +25,7 @@
 
     <!-- Bootstrap core CSS -->
     <!-- those checksums can be verified with: shasum -b -a 384 $file | xxd -r -p | base64 -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
 
     <!-- Custom styles for this template -->
     <link href="<TMPL_VAR BASEURL>bootstrap.local.css" rel="stylesheet" />
@@ -43,39 +43,54 @@
     <nav class="navbar fixed-top navbar-light bg-light">
       <div class="container-fluid">
         <div class="navbar-header">
-            <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>
+		  <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>
+          <a class="navbar-brand" href="<TMPL_VAR BASEURL>">
+            <img alt="<TMPL_VAR WIKINAME>" src="<TMPL_VAR BASEURL>favicon.png" width="48" height="48" />
+          </a>
         </div>
 
-
         <div id="navbar" class="collapse navbar-collapse">
+
+          <TMPL_IF OTHERLANGUAGES>
+		  <div class="dropdown navbar-left">
+		   <button class="btn language-switcher dropdown-toggle" type="button" id="language-menu-top" data-toggle=
+"dropdown" aria-haspopup="true" aria-expanded="true">
+            <TMPL_VAR LANG_NAME>
+			<img src="<TMPL_VAR BASEURL>wikiicons/languages.png">
+			</button>
+			<ul class="dropdown-menu" aria-labelledby="language-menu-top">
+              <TMPL_LOOP OTHERLANGUAGES>
+              <li>
+			  <a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
+			  </li>
+              </TMPL_LOOP>
+              <TMPL_IF HAVE_ACTIONS>
+				<li class="improve-translations">
+                <a href="<TMPL_VAR BASEURL>contribute/how/translate/" rel="nofollow">Improve translations</a>
+                </li>
+              </TMPL_IF>
+            </ul>
+          </div>
+          </TMPL_IF>
+
             <TMPL_IF SIDEBAR>
             <TMPL_VAR SIDEBAR>
             </TMPL_IF>
+          <ul class="nav navbar-nav">
+            <TMPL_LOOP BOOTMENU>
+                <TMPL_IF FIRSTNAV>
+                    <li <TMPL_IF ACTIVE>class="active"</TMPL_IF>><a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a></li>
+                </TMPL_IF>
+            </TMPL_LOOP>
+
+
+
+          </ul>
         </div>
 
-        <TMPL_IF OTHERLANGUAGES>
-        <div class="dropdown">
-            <button class="btn language-switcher dropdown-toggle" type="button" id="language-menu-top" data-bs-toggle="dropdown" aria-expanded="false">
-                <img src="<TMPL_VAR BASEURL>wikiicons/languages.png">
-				<TMPL_VAR LANG_NAME>
-            </button>
-            <ul class="dropdown-menu" aria-labelledby="language-menu-top">
-                <TMPL_LOOP OTHERLANGUAGES>
-                <li>
-                    <a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
-                </li>
-                </TMPL_LOOP>
-                <TMPL_IF HAVE_ACTIONS>
-                <li class="improve-translations">
-                    <a href="<TMPL_VAR BASEURL>contribute/how/translate/" rel="nofollow">Improve translations</a>
-                </li>
-                </TMPL_IF>
-            </ul>
-        </div>
-        </TMPL_IF>
-    </div>
+      </div>
     </nav>
 
     <div class="container" id="content">
@@ -95,28 +110,27 @@
     </div> <!-- /container -->
 
     <footer class="footer" role="contentinfo">
-    <div class="container">
+	<div class="container">
 
     <TMPL_IF FOOTER>
     <TMPL_VAR FOOTER>
     </TMPL_IF>
 
-    </div>
+	</div>
     </footer>
 
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js" integrity="sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3" crossorigin="anonymous"></script>
+	<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js" integrity="sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
 
-
-    <!-- TODO: Find other ways to setup analytics
+	<!-- TODO: Find other ways to setup analytics
     <script data-goatcounter="https://analytics.anarc.at/count" async src="//analytics.anarc.at/count.js"></script>
     <noscript>
     <img src="https://analytics.anarc.at/count?p=<TMPL_VAR PAGE>&t=<TMPL_VAR TITLE ESCAPE=URL>" alt="tracking pixel to count visitors when Javascript is disabled" />
     </noscript>
-    -->
+	-->
   </body>
 </html>