diff --git a/CSS/Element/button.css b/CSS/Element/button.css
index 6bdba5f..34d3ebd 100644
--- a/CSS/Element/button.css
+++ b/CSS/Element/button.css
@@ -14,6 +14,7 @@
   display: flex;
   flex-direction: row;
   align-items: center;
+  cursor: pointer;
 }
 
 .btn-primary {
@@ -34,6 +35,10 @@
   aspect-ratio: 1/1;
 }
 
+.btn-form{
+    padding: 10px 20px;
+}
+
 .btn-login{
   background-color: transparent;
 }
@@ -41,3 +46,7 @@
 .btn-user > span {
   font-size: 28px;
 }
+
+.btn-logout{
+  background-color: red;
+}
diff --git a/CSS/style.css b/CSS/style.css
index 2f2d81e..3634670 100644
--- a/CSS/style.css
+++ b/CSS/style.css
@@ -1,4 +1,5 @@
 @import url(variables.css);
+@import url(style_columns.css);
 @import url(Block/header.css);
 @import url(Block/footer.css);
 @import url(Element/logo.css);
@@ -36,7 +37,6 @@ h2 {
 
 main {
     margin-top: 190px;
-    padding: 10px;
 }
 
 .msg {
diff --git a/CSS/style_columns.css b/CSS/style_columns.css
index 6c03506..57026a6 100644
--- a/CSS/style_columns.css
+++ b/CSS/style_columns.css
@@ -6,6 +6,12 @@
 /*** 12 spaltiges Grid mit Flexboxen ***/
 
 /*** Container ***/
+
+.container{
+    max-width: 90%;
+    padding: 24px 42px 24px 42px;
+}
+
 .row {
     display: flex;
     flex-flow: row;
diff --git a/Controller/UserController.php b/Controller/UserController.php
index 1cb8e97..4904508 100644
--- a/Controller/UserController.php
+++ b/Controller/UserController.php
@@ -130,7 +130,8 @@ class UserController{
 
     public function logout(){
         $this->clearUserSession();
-        echo "Erfolgreich ausgeloggt";
+        header("Location: index.php?controller=user&do=showUserLoginForm");
+        exit();
     }
 
     public function isUserLoggenIn(){
@@ -140,4 +141,8 @@ class UserController{
     public function getCurrentUserId(){
         return $_SESSION["user_id"] ?? null;
     }
+
+    public function showUserAccountPage (){
+        
+    }
 }
\ No newline at end of file
diff --git a/Views/User/showUserAccountPage.phtml b/Views/User/showUserAccountPage.phtml
new file mode 100644
index 0000000..80b531e
--- /dev/null
+++ b/Views/User/showUserAccountPage.phtml
@@ -0,0 +1,17 @@
+<?php
+    include dirname(__DIR__).'/header.phtml';
+?>
+
+<article>
+    <div class="container">
+        <div class="row">
+            <div class="col-12">
+                <form method="post">
+                    <input type="hidden" name="controller" value="user">
+                    <input type="hidden" name="do" value="logout">
+                    <button type="submit" class="btn btn-logout">Ausloggen</button>
+                </form>
+            </div>
+        </div>
+    </div>
+</article>
\ No newline at end of file
diff --git a/Views/User/showUserLoginForm.phtml b/Views/User/showUserLoginForm.phtml
index af1cff4..73dbada 100644
--- a/Views/User/showUserLoginForm.phtml
+++ b/Views/User/showUserLoginForm.phtml
@@ -27,12 +27,7 @@
     
     <input type="hidden" name="controller" value="user">
     <input type="hidden" name="do" value="login">
-    <button type="submit" class="btn" style="display: block">Login</button>
+    <button type="submit" class="btn btn-primary btn-form" style="display: block">Login</button>
 
 
 </form>
-
-
-<?php
-include dirname(__DIR__).'/footer.phtml';
-?>
diff --git a/Views/header.phtml b/Views/header.phtml
index 022093e..09c29ad 100644
--- a/Views/header.phtml
+++ b/Views/header.phtml
@@ -16,16 +16,25 @@
 <body>
     <header>
         <nav class="d-flex-between">
-            <a id="logo" href="/">bib<span>course</span></a>
+            <a id="logo" href="index.php">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): ?>
+                        <?php if($_SESSION['user_role'] == 'admin'): ?>
                         <a style="column-gap: 16px;" class="btn" href="?controller=Admin&do=showForm">
-                            <?php echo ($_SESSION['vorname'] ?? "") . " " . ($_SESSION['name'] ?? "") ?>
+                            <?php echo ($_SESSION['vorname'] ?? "") . " " . ($_SESSION['name'] ?? "") . ", " . ($_SESSION['user_role']) ?>
                             <span class="btn btn-user">
                                 <span class="material-icons">person</span>
                             </span>
                         </a>
+                        <?php else: ?>
+                        <a style="column-gap: 16px;" class="btn" href="?controller=User&do=showUserAccountPage">
+                            <?php echo ($_SESSION['vorname'] ?? "") . " " . ($_SESSION['name'] ?? "") . ", " . ($_SESSION['user_role']) ?>
+                            <span class="btn btn-user">
+                                <span class="material-icons">person</span>
+                            </span>
+                        </a>
+                        <?php endif; ?>
                     <?php else: ?>
                         <a class="btn" href="?controller=User&do=showUserLoginForm">Anmeldung</a>
                         <a class="btn btn-primary" href="?controller=User&do=showUserRegisterForm">Registration</a>
