diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 274a0e4..b7c659a 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,26 +1,23 @@
 <script setup lang="ts">
 import { RouterLink, RouterView } from 'vue-router';
 import HeaderNav from './components/HeaderNav.vue';
+import { BoltIcon } from 'lucide-vue-next';  
 
-const isTeacher = false
-const isLoggedIn = true
-
+const isTeacher = true;
+const isLoggedIn = true;
 </script>
 
 <template>
-    <div class="sticky top-0">
-    <header>
-      <HeaderNav :isLoggedIn="isLoggedIn" :isTeacher="isTeacher">
-        <template #left-icon>
-          <BoltIcon class="icon" /> <!--Hier dann ein richtiges Logo rein-->
-        </template>
-      </HeaderNav>
-    </header>
+  <header class="sticky top-0 z-50 bg-black w-full">
+    <HeaderNav :isLoggedIn="isLoggedIn" :isTeacher="isTeacher">
+      <template #left-icon>
+        <BoltIcon class="icon" />
+      </template>
+    </HeaderNav>
+  </header>
+  <div id="app" class="flex flex-col min-h-screen overflow-x-hidden">
+    <main class="flex-grow p-4">
+      <RouterView />
+    </main>
   </div>
-  <RouterView />
-</template>
-
-
-<style scoped>
-
-</style>
+</template>
\ No newline at end of file
diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css
index ed04f51..40a5eeb 100644
--- a/frontend/src/assets/main.css
+++ b/frontend/src/assets/main.css
@@ -20,16 +20,3 @@ a,
     background-color: hsla(160, 100%, 37%, 0.2);
   }
 }
-
-@media (min-width: 1024px) {
-  body {
-    display: flex;
-    place-items: start;
-  }
-
-  #app {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    padding: 0 2rem;
-  }
-}
diff --git a/frontend/src/components/HeaderNav.vue b/frontend/src/components/HeaderNav.vue
index eb0dbf1..1c85d0d 100644
--- a/frontend/src/components/HeaderNav.vue
+++ b/frontend/src/components/HeaderNav.vue
@@ -1,71 +1,78 @@
 <template>
-    <nav class="header-container">
-      <div class="left-icon">
-        <!-- Platzhalter für ein Icon -->
-        <slot name="left-icon"></slot>
-      </div>
-      <div class="nav-items">
+  <nav class="header-container">
+    <div class="left-icon">
+      <slot name="left-icon"></slot>
+    </div>
+    <div class="nav-items">
+      <button
+        v-if="!isLoggedIn"
+        class="nav-button"
+      >
+        <component :is="LogInIcon" class="icon" />
+        Login
+      </button>
+      <template v-if="isLoggedIn">
+        <button class="nav-button">
+          <component :is="LogOutIcon" class="icon" />
+          Logout
+        </button>
+
         <button
-          v-if="!isLoggedIn"
+          v-if="isTeacher"
           class="nav-button"
         >
-          <component :is="LogInIcon" class="icon" />
-          Login
+          <component :is="BoltIcon" class="icon" />
+          Lehrerverwaltung
         </button>
-  
-        <template v-else>
-          <button class="nav-button">
-            <component :is="LogOutIcon" class="icon" />
-            Logout
-          </button>
-  
-          <button
-            v-if="isTeacher"
-            class="nav-button"
-          >
-            <component :is="BoltIcon" class="icon" />
-            Lehrerverwaltung
-          </button>
-        </template>
-      </div>
-    </nav>
-  </template>
-  
-  <script setup lang="ts">
-  import { LogInIcon, LogOutIcon, BoltIcon } from 'lucide-vue-next';
-  
-  defineProps<{
-    isLoggedIn: boolean;
-    isTeacher: boolean;
-  }>();
-  </script>
-  
-  <style scoped>
-  .header-container {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 1rem;
-  }
-  
-  .nav-items {
-    display: flex;
-    gap: 1rem;
-  }
-  
-  .nav-button {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-    background: none;
-    border: none;
-    cursor: pointer;
-    font-weight: bold;
-  }
-  
-  .icon {
-    width: 1rem;
-    height: 1rem;
-  }
-  </style>
-  
\ No newline at end of file
+      </template>
+    </div>
+  </nav>
+</template>
+
+<script setup lang="ts">
+import { LogInIcon, LogOutIcon, BoltIcon } from 'lucide-vue-next';
+
+defineProps<{
+  isLoggedIn: boolean;
+  isTeacher: boolean;
+}>();
+</script>
+
+<style scoped>
+.header-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 1rem;
+  width: 100%; 
+  box-sizing: border-box; 
+}
+
+.left-icon {
+  display: flex;
+  align-items: center;
+}
+
+.nav-items {
+  display: flex;
+  gap: 1rem;
+  align-items: center;
+  margin-left: auto; 
+}
+
+.nav-button {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  background: none;
+  border: none;
+  cursor: pointer;
+  font-weight: bold;
+  color: white;
+}
+
+.icon {
+  width: 1rem;
+  height: 1rem;
+}
+</style>