diff --git a/CSS/style.css b/CSS/style.css
index c3efcb2..6fda564 100644
--- a/CSS/style.css
+++ b/CSS/style.css
@@ -164,7 +164,7 @@ a {
     box-sizing: border-box;
 }
 
-.tickets-container  {
+.event-container  {
     position: absolute;
     top: 200px;
     background-color: #BAC8D4;
@@ -297,7 +297,7 @@ a {
         padding: 16px 8px;
         box-sizing: border-box;
     }
-    .tickets-container {
+    .event-container {
         position: static;
         width: 95vw;
         max-width: 400px;
@@ -310,7 +310,7 @@ a {
         font-size: 1.5em;
         text-align: center;
     }
-    .tickets-container h1 {
+    .event-container h1 {
         font-size: 1.5em;
         text-align: center;
     }
diff --git a/Views/Register/showRegisterPage.phtml b/Views/Auth/showRegistrationForm.phtml
similarity index 100%
rename from Views/Register/showRegisterPage.phtml
rename to Views/Auth/showRegistrationForm.phtml
diff --git a/Views/Event/showEvents.phtml b/Views/Event/showEvents.phtml
index 55ab417..bab1dc8 100644
--- a/Views/Event/showEvents.phtml
+++ b/Views/Event/showEvents.phtml
@@ -3,6 +3,10 @@
     <h2>Alle Ausstellungen</h2>
 
 <?php if (!empty($events)): ?>
+    <div class="inhalt">
+    <div class="event-container">
+    <h1>Tickets</h1>
+    <div class="event-container-inhalt">
     <table>
         <thead>
         <tr>
@@ -28,5 +32,8 @@
 <?php else: ?>
     <p>Derzeit sind keine Ausstellungen verfügbar.</p>
 <?php endif; ?>
+    </div>
+    </div>
+    </div>
 
 <?php include dirname(__DIR__) . '/footer.phtml'; ?>
\ No newline at end of file
diff --git a/Views/header.phtml b/Views/header.phtml
index 7c63c0d..53a1f41 100644
--- a/Views/header.phtml
+++ b/Views/header.phtml
@@ -12,11 +12,11 @@
             <div id="logo" ><a class="link-logo" href="#"></a></div>
             <button id="nav-toggle-btn" aria-label="Menü ein-/ausklappen">&#9660;</button>
             <div class="nav-links">
-                <a id="link-tickets" class="links" href="?controller=Tickets&do=showTickets">Tickets</a>
+                <a id="link-tickets" class="links" href="?controller=Event&do=showEvents">Event</a>
                 <a id="link-infos" class="links" href="?controller=Welcome&do=showWelcome">Infos</a>
                 <a id="link-profil" class="links" href="?controller=Profile&do=showProfile">Profil</a>
-                <a id="link-login" class="links" href="?controller=Login&do=showLoginPage">Login</a>
-                <a id="link-register" class="links" href="?controller=Register&do=showRegisterPage">Register</a>
+                <a id="link-login" class="links" href="?controller=Auth&do=showLoginForm">Login</a>
+                <a id="link-register" class="links" href="?controller=Auth&do=showRegistrationForm">Register</a>
                 <div id="profile-picture"></div>
             </div>
         </div>