diff --git a/auth/login.html b/auth/login.php
similarity index 94%
rename from auth/login.html
rename to auth/login.php
index a48c13d..4f009dc 100644
--- a/auth/login.html
+++ b/auth/login.php
@@ -2,8 +2,6 @@
     Form: Login-Bereich
     Funktion: Benutzerauthentifizierung und Zugang zum eigenen Profil, Erstellen von Beiträgen, etc.
 -->
-<form name="loginForm" action="?pfad=profile" method="POST">
-
     <div style="width: 50%">
         <div style="width: 130px;">
             <img src="../images/logo.png" width="120" height="72">
@@ -27,4 +25,3 @@
             <a href="index.html?pfad=auth/register" style="text-align: center;"> Noch keinen Account? Jetzt hier registrieren! </a>
         </div>
     </div>
-</form>
diff --git a/auth/register.html b/auth/register.php
similarity index 94%
rename from auth/register.html
rename to auth/register.php
index 5490a2d..4aff5ac 100644
--- a/auth/register.html
+++ b/auth/register.php
@@ -2,7 +2,6 @@
     Form: Registrierung
     Funktion: Erstellung neuer Benutzerkonten
 -->
-<form name="loginForm" action="?pfad=register" method="POST">
 
     <div style="width: 50%">
         <div style="width: 130px;">
@@ -29,4 +28,3 @@
         </div>
         <button type="submit" value="anmelden" name="loginSubmit" style="width: 80%;">kostenlos registrieren</button>
     </div>
- </form>
diff --git a/content/home.html b/content/home.html
new file mode 100644
index 0000000..099883b
--- /dev/null
+++ b/content/home.html
@@ -0,0 +1,17 @@
+<!--
+    Seite: Home
+    Inhalt: Beinhaltet den Inhalt der Startseite
+-->
+<main>
+
+    <h1>EduForge</h1>
+    <p>
+        Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
+        dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
+        clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet,
+        consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
+        sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
+        sea takimata sanctus est Lorem ipsum dolor sit amet.
+    </p>
+
+</main>
\ No newline at end of file
diff --git a/includes/navbar.php b/includes/navbar.php
index e1d7815..0e0a9b9 100644
--- a/includes/navbar.php
+++ b/includes/navbar.php
@@ -1,25 +1,22 @@
 <!--
 Globales Menü, wird via PHP später in alle Seiten eingebunden
 -->
-<div style="width: 100%; z-index: 1; position: fixed">
-    <div style="width: 20%;">
-        <img src="../images/logo.png" style="height: 44px;  ">
-    </div>
+<nav>
+	<img src="../images/logo.png" style="height: 44px;  ">
 
-    <a href = "../content/informatik.html" style = "color: white; padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
-    |
-    <a href = "../content/mathe.html" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Mathe</b></a>
-    |
-    <a href = "../content/physik.html" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Physik</b></a>
-    |
-    <a href = "../content/profile.html" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Dein Profil</b></a>
-    <?php
-    include_once 'includes/search.html';
-    ?>
-    <div>
-        <a href = "index.html?pfad=auth/login.html" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
-    </div>
-    <div>
-        <a href = "index.html?pfad=auth/register.html" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
-    </div>
-</div>
\ No newline at end of file
+	<a href = "../content/informatik.html" style = "color: white; padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
+	|
+	<a href = "../content/mathe.html" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Mathe</b></a>
+	|
+	<a href = "../content/physik.html" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Physik</b></a>
+	|
+	<a href = "../content/profile.html" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Dein Profil</b></a>
+	|
+	<?php
+	include_once 'includes/search.php';
+	?>
+	|
+	<a href = "index.php?pfad=auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
+
+	<a href = "index.php?pfad=auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
+</nav>
\ No newline at end of file
diff --git a/includes/search.php b/includes/search.php
index 382fc1e..9c48e40 100644
--- a/includes/search.php
+++ b/includes/search.php
@@ -1,8 +1,5 @@
 <!--
 Suchleiste. Wird via PHP später in alle Seiten eingebunden
 -->
-<form action="/suche" method="GET">
-  <label for="site-search">Suche:</label>
-  <input type="search" id="site-search" name="q" placeholder="Suchen...">
-  <button type="submit">Suchen</button>
-</form>
\ No newline at end of file
+<input type="search" id="site-search" name="q" placeholder="Suchen...">
+<button type="submit">Suchen</button>
\ No newline at end of file
diff --git a/index.php b/index.php
index ed0278b..c36428a 100644
--- a/index.php
+++ b/index.php
@@ -16,26 +16,9 @@
 
 <body>
 
-    <nav>
-        <?php
-	        include_once 'includes/navbar.html';
-	    ?>
-    </nav>
-
-
-    <main>
-
-        <h1>EduForge</h1>
-        <p>
-            Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
-            dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
-            clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet,
-            consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
-            sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
-            sea takimata sanctus est Lorem ipsum dolor sit amet.
-        </p>
-
-    </main>
+    <?php
+	include_once 'includes/navbar.php';
+	?>
 
     <footer>
         <a href="legal/impressum.html">Impressum</a>