diff --git a/auth/register.html b/auth/register.html
index dc4a9c2..5490a2d 100644
--- a/auth/register.html
+++ b/auth/register.html
@@ -1,52 +1,32 @@
 <!--
-    Seite: Registrierung
+    Form: Registrierung
     Funktion: Erstellung neuer Benutzerkonten
 -->
-<!DOCTYPE html>
-<html lang="de">
+<form name="loginForm" action="?pfad=register" method="POST">
 
-<head>
-    <meta charset="utf-8">
-    <meta name="description" content="Gästebuch Beispiel">
-    <meta name="author" content="Dietrich Boles">
-    <link rel="stylesheet" href="css/main.css" />
-    <title>Gästebuch</title>
-</head>
+    <div style="width: 50%">
+        <div style="width: 130px;">
+            <img src="../images/logo.png" alt="" width="120" height="72">
+        </div>
 
-<body>
+        <h1 style="width: 50%; text-align: center">Jetzt Registrieren!</h1><br>
 
-<nav>
-    <div>
-        <a href="index.html">Homepage</a>
+        <label id="inputEmail">Email address</label>
+        <p style="width: 80%;"> Email:</p>
+        <input type="email" name="email"  style="width: 80%;" placeholder="mustermann@web.de" required autofocus>
+        <p  style="width: 80%;"> Vorname:</p>
+        <input type="text" name="vorname"  style="width: 80%;" placeholder="Max" required autofocus>
+        <p  style="width: 80%;"> Nachname:</p>
+        <input type="text" name="nachname"  style="width: 80%;" placeholder="Mustermann" required autofocus>
+
+        <label id="inputPassword">Passwort</label>
+        <p  style="width: 80%;"> Passwort:</p>
+        <input type="password" name="password"  style="width: 80%;" placeholder="Passwort" required>
+        <div style="width: 80%;">
+            <label>
+                <input type="checkbox" value="remember-me"> angemeldet bleiben
+            </label>
+        </div>
+        <button type="submit" value="anmelden" name="loginSubmit" style="width: 80%;">kostenlos registrieren</button>
     </div>
-    <div>
-        <a href="anmeldung.html">Anmelden/Abmelden</a>
-    </div>
-    <div>
-        <a href="registrierung.html">Registrieren</a>
-    </div>
-</nav>
-
-<main>
-
-    <h1>Registrierung</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>
-
-<footer>
-    <a href="impressum.html">Impressum</a>
-    <a href="datenschutz.html">Datenschutz</a>
-    <a href="nutzungsbedingungen.html">Nutzungsbedingungen</a>
-</footer>
-</body>
-
-</html>
\ No newline at end of file
+ </form>
diff --git a/content/informatik.html b/content/informatik.html
new file mode 100644
index 0000000..4bb8cb4
--- /dev/null
+++ b/content/informatik.html
@@ -0,0 +1,14 @@
+<!--
+    Seite: Informatik
+    Inhalt: Eine Übersicht über alle Beiträge zum Fach
+-->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/content/mathe.html b/content/mathe.html
new file mode 100644
index 0000000..a3d5462
--- /dev/null
+++ b/content/mathe.html
@@ -0,0 +1,14 @@
+<!--
+    Seite: Mathe
+    Inhalt: Eine Übersicht über alle Beiträge zum Fach
+-->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/content/physik.html b/content/physik.html
new file mode 100644
index 0000000..fbf8069
--- /dev/null
+++ b/content/physik.html
@@ -0,0 +1,14 @@
+<!--
+    Seite: Physik
+    Inhalt: Eine Übersicht über alle Beiträge zum Fach
+-->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/content/profile.html b/content/profile.html
new file mode 100644
index 0000000..c6b1e3b
--- /dev/null
+++ b/content/profile.html
@@ -0,0 +1,14 @@
+<!--
+    Seite: Profil
+    Inhalt: Das eigene Profil, wenn man angemeldet ist. Dort hat man die Möglichkeit seine Angaben zu ändern.
+-->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/includes/navbar.html b/includes/navbar.html
index 19dfe85..e1d7815 100644
--- a/includes/navbar.html
+++ b/includes/navbar.html
@@ -1,23 +1,25 @@
 <!--
 Globales Menü, wird via PHP später in alle Seiten eingebunden
 -->
-<div class="text-white navbar bg-dark" style="width: 100%; z-index: 1; position: fixed">
-    <div class="" style="width: 20%;">
+<div style="width: 100%; z-index: 1; position: fixed">
+    <div style="width: 20%;">
         <img src="../images/logo.png" style="height: 44px;  ">
     </div>
 
-    <a href = "index.php?pfad=profile" class="ft-si-15" style = "color: white; padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Dein Profil</b></a>
+    <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 = "index.php?pfad=gameServer" class=" ft-navbarRed ft-si-15" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Game-Server</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 = "http://192.168.2.199/ts3wi/" class="ft-navbarRed ft-si-15" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>TeamSpeak3-Server</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 = "index.php?pfad=404" class="ft-navbarRed ft-navbarRed ft-si-15" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>NextCloud-Server</b></a>
-
-    <div class="float-right">
-        <a href = "" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Login </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 = "" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Register </a>
+        <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
diff --git a/includes/search.html b/includes/search.html
new file mode 100644
index 0000000..382fc1e
--- /dev/null
+++ b/includes/search.html
@@ -0,0 +1,8 @@
+<!--
+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
diff --git a/index.html b/index.html
index d546c75..ed0278b 100644
--- a/index.html
+++ b/index.html
@@ -26,9 +26,6 @@
     <main>
 
         <h1>EduForge</h1>
-
-        <img src="images/guestbook.png" alt="Gästebuch">
-
         <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
