diff --git a/doxygen/layout/custom_footer.html b/doxygen/layout/custom_footer.html
index 01670496..15ed4327 100644
--- a/doxygen/layout/custom_footer.html
+++ b/doxygen/layout/custom_footer.html
@@ -6,7 +6,7 @@
 							target="_new">Doxygen</a> $doxygenversion</span>
 				</p>
 			</footer>
-            </div>
+		<!-- </div> container -->
 		<script src="/sfizz/assets/js/scripts.min.js"></script>
 	</body>
 </html>
diff --git a/doxygen/layout/custom_header.html b/doxygen/layout/custom_header.html
index 866b5a66..bf5a07f6 100644
--- a/doxygen/layout/custom_header.html
+++ b/doxygen/layout/custom_header.html
@@ -26,16 +26,14 @@
 			content="#da532c">
 		<meta name="msapplication-config" content="/sfizz/assets/ico/browserconfig.xml">
 		<meta name="theme-color" content="#ffffff">
-
-<link href="$relpath$tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="$relpath$jquery.js"></script>
-<script type="text/javascript" src="$relpath$dynsections.js"></script>
+		<link href="$relpath$tabs.css" rel="stylesheet" type="text/css"/>
+		<script type="text/javascript" src="$relpath$jquery.js"></script>
+		<script type="text/javascript" src="$relpath$dynsections.js"></script>
 $treeview
 $search
 $mathjax
-<link href="$relpath$$stylesheet" rel="stylesheet" type="text/css" />
+		<link href="$relpath$$stylesheet" rel="stylesheet" type="text/css" />
 $extrastylesheet
-
 		<!-- Stylesheets -->
 		<link href="/sfizz/assets/css/style.min.css"
 			rel="stylesheet" media="screen">
@@ -44,36 +42,107 @@ $extrastylesheet
 		<script src="https://kit.fontawesome.com/8d25d19870.js"></script>
 	</head>
 	<body>
-        <div class="container">
 		<button onclick="topFunction()" id="scrollButton" title="Go to top">Top</button>
-		<a href="#content" class="sr-only">Skip to content</a>
+		<div class="container">
 			<nav class="navbar navbar-expand-lg navbar-dark" style="background-color:#222">
-				<a class="navbar-brand" href="/sfizz/"><img src="/sfizz/assets/img/logo.png"
-                    width="30" height="30" class="d-inline-block">sfizz</a>
-
+				<a class="navbar-brand" href="/sfizz/">
+					<img src="/sfizz/assets/img/logo.png"
+					width="30" height="30" class="d-inline-block" alt="">
+					sfizz</a>
 				<button class="navbar-toggler" type="button" data-toggle="collapse"
 					data-target="#navbarContent" aria-controls="navbarContent"
 					aria-expanded="false" aria-label="Toggle navigation">
 					<span class="navbar-toggler-icon"></span>
 				</button>
-
 				<div class="collapse navbar-collapse" id="navbarContent">
 					<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
 						<li class="nav-item">
-							<a class="nav-link" href="/sfizz/status"><i class="fas fa-tasks fa-fw"
-									aria-hidden="true"></i>&nbsp;Status</a>
+							<a class="nav-link" href="/">
+								<i class="fas fa-home fa-fw" aria-hidden="true"></i>
+								&nbsp;Home</a>
+						</li>
+
+<!-- FIXME: Dropdown buttons are shown but menus are broken for some reason
+            (not the container div)
+
+						<li class="nav-item dropdown">
+							<a class="nav-link dropdown-toggle" href="#"
+								id="navbarProjects" data-toggle="dropdown"
+								aria-haspopup="true" aria-expanded="false">
+								<i class="fas fa-hammer fa-fw" aria-hidden="true"></i>
+								&nbsp;Projects</a>
+							<div class="dropdown-menu" aria-labelledby="navbarProjects">
+								<a class="dropdown-item"
+									href="/beatbox/">
+									<i class="fas fa-drum fa-fw" aria-hidden="true"></i>
+									&nbsp;BeatBox</a>
+								<a class="dropdown-item disabled"
+									href="/sfizz/">
+									<i class="fas fa-play-circle fa-fw" aria-hidden="true"></i>
+									&nbsp;sfizz</a>
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item"
+									href="https://github.com/sfztools/sfizz-render/">
+									sfizz-render</a>
+								<a class="dropdown-item"
+									href="https://github.com/sfztools/sfz-flat/">
+									sfz-flat</a>
+								<a class="dropdown-item"
+									href="https://github.com/sfztools/sfz-opcode-checker/">
+									sfz-opcode-checker</a>
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item"
+									href="https://github.com/sfztools/emacs-sfz-mode/">
+									Emacs Syntax Highlight</a>
+								<a class="dropdown-item"
+									href="https://github.com/sfztools/syntax-highlighting-gedit/">
+									gedit Syntax Highlight</a>
+								<a class="dropdown-item"
+									href="https://github.com/sfztools/syntax-highlighting-geany/">
+									Geany Syntax Highlight</a>
+								<a class="dropdown-item"
+									href="https://github.com/sfztools/syntax-highlighting-sublime-text/">
+									Sublime Text Syntax Highlight</a>
+								<a class="dropdown-item"
+									href="https://github.com/sfztools/sfz.vim">
+									Vim Syntax Highlight</a>
+								<a class="dropdown-item"
+									href="https://github.com/sfztools/syntax-highlighting-vscode/">
+									VSCode Syntax Highlight</a>
+							</div>
+						</li>
+						<li class="nav-item dropdown">
+							<a class="nav-link dropdown-toggle" href="#"
+								id="navbarDocumentation" data-toggle="dropdown"
+								aria-haspopup="true" aria-expanded="false">
+								<i class="fas fa-book fa-fw" aria-hidden="true"></i>
+								&nbsp;Documentation</a>
+							<div class="dropdown-menu" aria-labelledby="navbarDocumentation">
+								<a class="dropdown-item"
+									href="/sfizz/api"><i class="fas fa-code fa-fw" aria-hidden="true"></i>
+									&nbsp;API</a>
+								<a class="dropdown-item"
+									href="/sfizz/development/build">
+									<i class="fas fa-code fa-fw" aria-hidden="true"></i>
+									&nbsp;Build</a>
+								<a class="dropdown-item"
+									href="/sfizz/development/status">
+									<i class="fas fa-tasks fa-fw" aria-hidden="true"></i>
+									&nbsp;SFZ Opcodes</a>
+							</div>
+						</li>
+-->
+					</ul>
+					<ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
+						<li class="nav-item">
+							<a class="nav-link" href="/sfizz/downloads">
+								<i class="fas fa-download fa-fw" aria-hidden="true"></i>
+								Download</a>
 						</li>
 						<li class="nav-item">
-							<a class="nav-link" href="/sfizz/downloads"><i class="fas fa-download fa-fw"
-									aria-hidden="true"></i>&nbsp;Downloads</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" href="/sfizz/contacts"><i class="fas fa-at fa-fw"
-									aria-hidden="true"></i>&nbsp;Contacts</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" href="https://sfztools.github.io/"><i class="fas fa-home fa-fw"
-									aria-hidden="true"></i>&nbsp;Home</a>
+							<a class="nav-link" href="/sfizz/search/">
+								<i class="fas fa-search fa-fw" aria-hidden="true"></i>
+								Search</a>
 						</li>
 					</ul>
 				</div>
@@ -83,4 +152,4 @@ $searchbox
 <!--END SEARCHENGINE-->
 <!--END DISABLE_INDEX-->
 			</nav>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+			<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
