diff --git a/CSS/Block/footer.css b/CSS/Block/footer.css
index acfc3b5..3ec6139 100644
--- a/CSS/Block/footer.css
+++ b/CSS/Block/footer.css
@@ -1,3 +1,5 @@
 footer{
-    background: var(--fullblock);
+    display: flex;
+    flex-direction: row;
+    padding: 24px 42px 24px 42px;
 }
\ No newline at end of file
diff --git a/CSS/Block/header.css b/CSS/Block/header.css
index 03ae75e..bdbd49f 100644
--- a/CSS/Block/header.css
+++ b/CSS/Block/header.css
@@ -1,38 +1,12 @@
 header {
     position: fixed;
     top: 0px;
+    left: 0px;
     width: 100%;
-    text-align: center;
-    padding-top: 10px;
-    background: var(--fullblock);
 }
 
-nav ul {
-    list-style-type: none;
-    padding: 0;
-    display: inline-block;
-    margin: 0;
-}
-
-nav li {
-    float: left;
-    text-align: center;
-    
-}
-
-nav li a {
-    display: block;
-    width: 100px;
-    height: 30px;
-    border: 1px solid #4d4d4d;
-    background-color: #4d4d4d;
-    color: white;
-    text-decoration: none;
-    margin: 5px;
-    text-align: center;
-    line-height: 30px;
-}
-
-nav li a:hover {
-    background-color: orange;
+nav {
+    display: flex;
+    flex-direction: row;
+    padding: 24px 42px 24px 42px;
 }
\ No newline at end of file
diff --git a/CSS/Element/button.css b/CSS/Element/button.css
index 8df442c..3bbb93c 100644
--- a/CSS/Element/button.css
+++ b/CSS/Element/button.css
@@ -1,11 +1,17 @@
 .btn{
-  background: var(--brand-primary);
-  color: var(--brand-white);
   padding: 5px 10px;
   font-weight: var(--font-weight-semibold);
   font-size: var(--font-size-text);
-  border-radius: 3px;
   text-decoration: none;
+  color: var(--brand-white);
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.btn-primary {
+  background: var(--brand-primary);
+  border-radius: 3px;
 }
 
 .btn-user {
@@ -23,4 +29,4 @@
 
 .btn-user > span {
   font-size: 28px;
-}
\ No newline at end of file
+}
diff --git a/CSS/Element/logo.css b/CSS/Element/logo.css
index bfc608d..fbca2c2 100644
--- a/CSS/Element/logo.css
+++ b/CSS/Element/logo.css
@@ -1,7 +1,13 @@
-.logo{
+#logo{
+    cursor: pointer;
+    text-decoration: none;
+    color: inherit;
+    color: var(--brand-white);
+    font-size: var(--font-size-logo);
+    font-weight: 600;
+}
+
+#logo span {
+    color: var(--brand-primary);
     font-size: var(--font-size-logo);
-        span{
-            color: var(--brand-primary);
-            font-size: var(--font-size-logo);
-        }
 }
\ No newline at end of file
diff --git a/CSS/style.css b/CSS/style.css
index 32ad975..2f2d81e 100644
--- a/CSS/style.css
+++ b/CSS/style.css
@@ -39,11 +39,6 @@ main {
     padding: 10px;
 }
 
-#wrapper {
-    max-width: 90%;
-    margin: 0 auto
-}
-
 .msg {
     text-align: center;
     font-size: 17px;
diff --git a/CSS/variables.css b/CSS/variables.css
index f72b739..e573f4a 100644
--- a/CSS/variables.css
+++ b/CSS/variables.css
@@ -15,7 +15,7 @@
     /* Font-size*/
     --font-size-title-h1: 62px;
     --font-size-logo: 36px; 
-    --font-size-text: 24px; 
+    --font-size-text: 20px; 
     --font-size-smalltext: 18px; 
 
     /*Font-Weight*/
diff --git a/Controller/UserController.php b/Controller/UserController.php
index a58a4fc..46512de 100644
--- a/Controller/UserController.php
+++ b/Controller/UserController.php
@@ -63,6 +63,8 @@ class UserController{
     public function setUserSession(array $user){
         $_SESSION["user_id"] = $user["id"];
         $_SESSION["user_role"] = $user["role"];
+        $_SESSION["vorname"] = $user["vorname"];
+        $_SESSION["name"] = $user["name"];
     }
 
     public function clearUserSession(){
diff --git a/Views/footer.phtml b/Views/footer.phtml
index 81595e7..58f5faa 100644
--- a/Views/footer.phtml
+++ b/Views/footer.phtml
@@ -1,11 +1,6 @@
 </main>
-        </div>
-        <footer>
-            <div id="wrapper">
-                <div class="d-flex-between">
-                    <h3 class="logo">bib<span>course</span></h3>
-                </div>
-            </div>
-        </footer>
+    <footer>
+        footer
+    </footer>
     </body>
 </html>
diff --git a/Views/header.phtml b/Views/header.phtml
index a21a709..022093e 100644
--- a/Views/header.phtml
+++ b/Views/header.phtml
@@ -15,23 +15,23 @@
 
 <body>
     <header>
-        <div id="wrapper">
-            <div class="d-flex-between">
-                <h3 class="logo">bib<span>course</span></h3>
-                <div id="metanavi">
-                    <a class="btn btn-user" href="?controller=Admin&do=showForm"><span class="material-icons">person</span></a>
-                    <a class="btn btn-register" href="?controller=User&do=showUserRegisterForm">Registration</a>
+        <nav class="d-flex-between">
+            <a id="logo" href="/">bib<span>course</span></a>
+            <div style="column-gap: 8px;" class="d-flex-between">
+                <div style="column-gap: 8px;" class="d-flex-between">
+                    <?php if (isset($_SESSION['user_id']) && $_SESSION['user_id'] !== null): ?>
+                        <a style="column-gap: 16px;" class="btn" href="?controller=Admin&do=showForm">
+                            <?php echo ($_SESSION['vorname'] ?? "") . " " . ($_SESSION['name'] ?? "") ?>
+                            <span class="btn btn-user">
+                                <span class="material-icons">person</span>
+                            </span>
+                        </a>
+                    <?php else: ?>
+                        <a class="btn" href="?controller=User&do=showUserLoginForm">Anmeldung</a>
+                        <a class="btn btn-primary" href="?controller=User&do=showUserRegisterForm">Registration</a>
+                    <?php endif; ?>
                 </div>
             </div>
-            <nav>
-                <ul>
-                    <li><a href="?controller=Welcome&do=showWelcome">Willkommen</a></li>
-                    <li><a href="#">Projekte</a></li>
-                    <li><a href="#">Workshops</a></li>
-                    <li><a href="?controller=Contact&do=showContactForm">Kontakt</a></li>
-                </ul>
-            </nav>
-        </div>
+        </nav>
     </header>
-    <div id="wrapper">
-        <main>
\ No newline at end of file
+    <main>
\ No newline at end of file
diff --git a/index.php b/index.php
index 9609eea..9c1a9fd 100644
--- a/index.php
+++ b/index.php
@@ -26,6 +26,10 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
     $doMethodName = isset($_GET['do']) && $_GET['do'] ? $_GET['do'] : "showWelcome";
 }
 
+// if(isset($_SESSION['user_id']) && $_SESSION['user_id'] !== null && $controllerName == "Welcome") {
+//    TODO: Hier noch direkt kurse öffnen falls der User angemeldet ist.
+// }
+
 $controllerClassName = 'Blog\\Controller\\'.ucfirst($controllerName).'Controller';
 
 if (method_exists($controllerClassName, $doMethodName)) {