diff --git a/web/frontend/src/Header.svelte b/web/frontend/src/Header.svelte
index 87fa380..038d1a3 100644
--- a/web/frontend/src/Header.svelte
+++ b/web/frontend/src/Header.svelte
@@ -1,21 +1,17 @@
 <script>
     import {
         Icon,
-        Button,
-        InputGroup,
-        Input,
         Collapse,
         Navbar,
         NavbarBrand,
         Nav,
-        NavItem,
         NavbarToggler,
         Dropdown,
         DropdownToggle,
-        DropdownMenu,
-        InputGroupText,
+        DropdownMenu
     } from "sveltestrap";
     import NavbarLinks from "./NavbarLinks.svelte";
+    import NavbarTools from "./NavbarTools.svelte";
 
     export let username; // empty string if auth. is disabled, otherwise the username as string
     export let authlevel; // Integer
@@ -104,7 +100,7 @@
 </script>
 
 <svelte:window bind:innerWidth={screenSize} />
-<Navbar color="light" light expand="sm" fixed="top">
+<Navbar color="light" light expand="md" fixed="top">
     <NavbarBrand href="/">
         <img alt="ClusterCockpit Logo" src="/img/logo.png" height="25rem" />
     </NavbarBrand>
@@ -112,11 +108,11 @@
     <Collapse
         {isOpen}
         navbar
-        expand="sm"
+        expand="md"
         on:update={({ detail }) => (isOpen = detail.isOpen)}
     >
-        <Nav navbar>
-            {#if screenSize > 1500 || screenSize < 576}
+        <Nav class="ms-auto" navbar>
+            {#if screenSize > 1500 || screenSize < 768}
                 <NavbarLinks
                     {clusters}
                     links={views.filter(
@@ -175,55 +171,7 @@
                     </Dropdown>
                 {/each}
             {/if}
+            <NavbarTools username={username} authlevel={authlevel} roles={roles} screenSize={screenSize}/>
         </Nav>
     </Collapse>
-    <Nav>
-        <NavItem>
-            <form method="GET" action="/search">
-                <InputGroup>
-                    <Input
-                        type="text"
-                        placeholder="Search 'type:<query>' ..."
-                        name="searchId"
-                    />
-                    <Button outline type="submit"><Icon name="search" /></Button
-                    >
-                    <InputGroupText
-                        style="cursor:help;"
-                        title={authlevel >= roles.support
-                            ? "Example: 'projectId:a100cd', Types are: jobId | jobName | projectId | arrayJobId | username | name"
-                            : "Example: 'jobName:myjob', Types are jobId | jobName | projectId | arrayJobId "}
-                        ><Icon name="info-circle" /></InputGroupText
-                    >
-                </InputGroup>
-            </form>
-        </NavItem>
-        {#if username}
-            <NavItem>
-                <form method="POST" action="/logout">
-                    <Button
-                        outline
-                        color="success"
-                        type="submit"
-                        style="margin-left: 10px;"
-                    >
-                        {#if screenSize > 1630}
-                            <Icon name="box-arrow-right" /> Logout {username}
-                        {:else}
-                            <Icon name="box-arrow-right" />
-                        {/if}
-                    </Button>
-                </form>
-            </NavItem>
-        {/if}
-        <NavItem>
-            <Button
-                outline
-                on:click={() => (window.location.href = "/config")}
-                style="margin-left: 10px;"
-            >
-                <Icon name="gear" />
-            </Button>
-        </NavItem>
-    </Nav>
 </Navbar>
diff --git a/web/frontend/src/NavbarTools.svelte b/web/frontend/src/NavbarTools.svelte
new file mode 100644
index 0000000..5655a7c
--- /dev/null
+++ b/web/frontend/src/NavbarTools.svelte
@@ -0,0 +1,124 @@
+<script>
+    import {
+        Icon,
+        NavItem,
+        InputGroup,
+        Input,
+        Button,
+        InputGroupText,
+        Container,
+        Row,
+        Col
+    } from "sveltestrap";
+
+    export let username; // empty string if auth. is disabled, otherwise the username as string
+    export let authlevel; // Integer
+    export let roles; // Role Enum-Like
+    export let screenSize // screensize
+
+</script>
+
+{#if screenSize >= 768}
+    <NavItem>
+        <form method="GET" action="/search">
+            <InputGroup>
+                <Input
+                    type="text"
+                    placeholder="Search 'type:<query>' ..."
+                    name="searchId"
+                    style="margin-left: 10px;"
+                />  <!-- bootstrap classes w/o effect -->
+                <Button outline type="submit"><Icon name="search" /></Button
+                >
+                <InputGroupText
+                    style="cursor:help;"
+                    title={authlevel >= roles.support
+                        ? "Example: 'projectId:a100cd', Types are: jobId | jobName | projectId | arrayJobId | username | name"
+                        : "Example: 'jobName:myjob', Types are jobId | jobName | projectId | arrayJobId "}
+                    ><Icon name="info-circle" /></InputGroupText
+                >
+            </InputGroup>
+        </form>
+    </NavItem>
+    {#if username}
+        <NavItem>
+            <form method="POST" action="/logout">
+                <Button
+                    outline
+                    color="success"
+                    type="submit"
+                    style="margin-left: 10px;"
+                >
+                    {#if screenSize > 1630}
+                        <Icon name="box-arrow-right" /> Logout {username}
+                    {:else}
+                        <Icon name="box-arrow-right" />
+                    {/if}
+                </Button>
+            </form>
+        </NavItem>
+    {/if}
+    <NavItem>
+        <Button
+            outline
+            on:click={() => (window.location.href = "/config")}
+            style="margin-left: 10px;"
+        >
+            <Icon name="gear" />
+        </Button>
+    </NavItem>
+{:else}
+    <NavItem>
+        <Container>
+            <Row cols={2}>
+                <Col xs="6">
+                    <form method="POST" action="/logout">
+                        <Button
+                            outline
+                            color="success"
+                            type="submit"
+                            size="sm"
+                            class="my-2 w-100"
+                        >
+                            <Icon name="box-arrow-right" /> Logout {username}
+                        </Button>
+                    </form>
+                </Col>
+                <Col xs="6">
+                    <Button
+                    outline
+                    on:click={() => (window.location.href = "/config")}
+                    size="sm"
+                    class="my-2 w-100"
+                >
+                    {#if authlevel >= roles.admin}
+                        <Icon name="gear" /> Admin Settings
+                    {:else}
+                        <Icon name="gear" /> Plotting Options
+                    {/if}
+                </Button>
+                </Col>
+            </Row>
+        </Container>
+    </NavItem>
+    <NavItem style="margin-left: 10px; margin-right:10px;">
+        <form method="GET" action="/search">
+            <InputGroup>
+                <Input
+                    type="text"
+                    placeholder="Search 'type:<query>' ..."
+                    name="searchId"
+                />
+                <Button outline type="submit"><Icon name="search" /></Button
+                >
+                <InputGroupText
+                    style="cursor:help;"
+                    title={authlevel >= roles.support
+                        ? "Example: 'projectId:a100cd', Types are: jobId | jobName | projectId | arrayJobId | username | name"
+                        : "Example: 'jobName:myjob', Types are jobId | jobName | projectId | arrayJobId "}
+                    ><Icon name="info-circle" /></InputGroupText
+                >
+            </InputGroup>
+        </form>
+    </NavItem>
+{/if}