diff --git a/tpl_header.php b/tpl_header.php
index f663014..7025d19 100755
--- a/tpl_header.php
+++ b/tpl_header.php
@@ -6,20 +6,6 @@
 
 // must be run from within DokuWiki
 if (!defined('DOKU_INC')) die();
-
-$siteToolsHtml = (new \dokuwiki\Menu\SiteMenu())->getListItems('action ');
-$userToolsHtml = '';
-if ($conf['useacl']) {
-    $userToolsHtml = (new \dokuwiki\Menu\UserMenu())->getListItems('action ');
-}
-
-$breadcrumbsHtml = '';
-if ($conf['youarehere']) {
-    $breadcrumbsHtml = tpl_youarehere(null, true);
-}
-if (!$breadcrumbsHtml && $conf['breadcrumbs']) {
-    $breadcrumbsHtml = tpl_breadcrumbs(null, true);
-}
 ?>
 
 <!-- ********** HEADER ********** -->
@@ -27,73 +13,76 @@ if (!$breadcrumbsHtml && $conf['breadcrumbs']) {
 
     <?php tpl_includeFile('header.html') ?>
 
-    <ul class="a11y skip">
-        <li><a href="#dokuwiki__content"><?php echo $lang['skip_to_content']; ?></a></li>
-    </ul>
+    <div class="headings group">
+        <ul class="a11y skip">
+            <li><a href="#dokuwiki__content"><?php echo $lang['skip_to_content']; ?></a></li>
+        </ul>
 
-    <div class="header__bar">
-        <div class="headings header__brand">
-            <h1 class="logo"><?php
-                // get logo either out of the template images folder or data/media folder
-                $logoSize = [];
-                $logo = tpl_getMediaFile([
-                    ':wiki:logo.svg', ':logo.svg',
-                    ':wiki:logo.png', ':logo.png',
-                    'images/logo.svg', 'images/logo.png'
-                ], false, $logoSize);
+        <h1 class="logo"><?php
+            // get logo either out of the template images folder or data/media folder
+            $logoSize = [];
+            $logo = tpl_getMediaFile([
+                ':wiki:logo.svg', ':logo.svg',
+                ':wiki:logo.png', ':logo.png',
+                'images/logo.svg', 'images/logo.png'
+            ], false, $logoSize);
 
-                // display logo and wiki title in a link to the home page
-                tpl_link(
-                    wl(),
-                    '<img src="' . $logo . '" ' . ($logoSize ? $logoSize[3] : '') . ' alt="" />' .
-                    '<span>' . $conf['title'] . '</span>',
-                    'accesskey="h" title="' . tpl_getLang('home') . ' [h]"'
-                );
-                ?></h1>
+            // display logo and wiki title in a link to the home page
+            tpl_link(
+                wl(),
+                '<img src="' . $logo . '" ' . ($logoSize ? $logoSize[3] : '') . ' alt="" />' .
+                '<span>' . $conf['title'] . '</span>',
+                'accesskey="h" title="' . tpl_getLang('home') . ' [h]"'
+            );
+            ?></h1>
+        <?php if ($conf['tagline']) : ?>
+            <p class="claim"><?php echo $conf['tagline']; ?></p>
+        <?php endif ?>
+    </div>
 
-            <?php if ($breadcrumbsHtml) : ?>
-                <div class="breadcrumbs header__breadcrumbs"><?php echo $bread  crumbsHtml; ?></div>
-            <?php endif ?>
-        </div>
+    <div class="tools group">
+        <!-- USER TOOLS -->
+        <?php if ($conf['useacl']) : ?>
+            <div id="dokuwiki__usertools">
+                <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3>
+                <ul>
+                    <?php
+                    if (!empty($_SERVER['REMOTE_USER'])) {
+                        echo '<li class="user">';
+                        tpl_userinfo(); /* 'Logged in as ...' */
+                        echo '</li>';
+                    }
+                        echo (new \dokuwiki\Menu\UserMenu())->getListItems('action ');
+                    ?>
+                </ul>
+            </div>
+        <?php endif ?>
 
-        <div id="dokuwiki__sitetools" class="tools header__actions">
+        <!-- SITE TOOLS -->
+        <div id="dokuwiki__sitetools">
             <h3 class="a11y"><?php echo $lang['site_tools']; ?></h3>
             <?php tpl_searchform(true, false); ?>
-
-            <?php if ($siteToolsHtml || $userToolsHtml) : ?>
-                <details class="header__menu">
-                    <summary aria-label="<?php echo hsc($lang['tools']); ?>" title="<?php echo hsc($lang['tools']); ?>">
-                        <span aria-hidden="true">&#8942;</span>
-                    </summary>
-
-                    <div class="header__menu-panel">
-                        <?php if ($siteToolsHtml) : ?>
-                            <ul class="header__menu-list header__menu-list--site">
-                                <?php echo $siteToolsHtml; ?>
-                            </ul>
-                        <?php endif ?>
-
-                        <?php if ($siteToolsHtml && $userToolsHtml) : ?>
-                            <div class="header__menu-separator" role="separator"></div>
-                        <?php endif ?>
-
-                        <?php if ($userToolsHtml) : ?>
-                            <div id="dokuwiki__usertools">
-                                <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3>
-                                <ul class="header__menu-list header__menu-list--user">
-                                    <?php echo $userToolsHtml; ?>
-                                </ul>
-                            </div>
-                        <?php endif ?>
-                    </div>
-                </details>
-            <?php endif ?>
-
             <div class="mobileTools">
                 <?php echo (new \dokuwiki\Menu\MobileMenu())->getDropdown($lang['tools']); ?>
             </div>
+            <ul>
+                <?php echo (new \dokuwiki\Menu\SiteMenu())->getListItems('action '); ?>
+            </ul>
         </div>
+
     </div>
 
+    <!-- BREADCRUMBS -->
+    <?php if ($conf['breadcrumbs'] || $conf['youarehere']) : ?>
+        <div class="breadcrumbs">
+            <?php if ($conf['youarehere']) : ?>
+                <div class="youarehere"><?php tpl_youarehere() ?></div>
+            <?php endif ?>
+            <?php if ($conf['breadcrumbs']) : ?>
+                <div class="trace"><?php tpl_breadcrumbs() ?></div>
+            <?php endif ?>
+        </div>
+    <?php endif ?>
+
     <hr class="a11y" />
 </div></header><!-- /header -->