diff --git a/templates/base.html b/templates/base.html
index 57b94e7..e44264c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -7,13 +7,11 @@
     <meta name="description"
           content="{% block description %}Fandom-Seite für {{ site_name or 'ein Spiel' }}{% endblock %}">
 
-    <!-- Google Font (optional) -->
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link rel="stylesheet" href="/static/css/style.css">
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;600;700;900&display=swap" rel="stylesheet">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet"
           integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" crossorigin="anonymous">
-    <!-- Basis-CSS (kleines, leichtes Fandom-Look) -->
     <style>
 
     </style>
@@ -22,7 +20,7 @@
 </head>
 <body>
 <div class="wrap">
-    <header class="topbar">
+    <header class="topbar d-flex justify-content-between p-3">
         <div class="brand">
             <div class="logo">GF</div>
             <div>
@@ -32,10 +30,16 @@
             </div>
         </div>
 
-        <div class="search" role="search">
+        <div class="search m-2 d-flex align-items-end" role="search">
+            <div>
+                {% block login_logout %}
+
+                {% endblock %}
+            </div>
+
             <form action="{{ url_for('search') }}" method="get">
                 <input name="q" placeholder="Suche Artikel, Charaktere, Items..." aria-label="Suche"
-                       value="{{ request.args.get('q','') }}">
+                       value="{{ request.args.get('q','') }}" class="form-control">
             </form>
         </div>
     </header>
@@ -45,7 +49,7 @@
     </nav>
 
     <div class="grid">
-        <main class="card">
+        <main class="card border-0">
             {% block hero %}
                 <div class="hero"
                      style="background-image: url('{{ url_for('static', filename='images/hero.jpg') }}');"></div>
