diff --git a/src/main/resources/html/site/index.html b/src/main/resources/html/site/index.html
index ac0ab38..91fae45 100644
--- a/src/main/resources/html/site/index.html
+++ b/src/main/resources/html/site/index.html
@@ -1,37 +1 @@
-<!DOCTYPE html>
-<html lang="de">
-    <head>
-        <meta charset="UTF-8">
-        <title>Login</title>
-        <link rel="stylesheet" href="style.css">
-    </head>
-    <body>
-        <h1>Login</h1>
-        <form id="loginForm">
-            <label for="username">Benutzername:</label>
-            <input type="text" id="username" name="username" required><br><br>
-            <label for="password">Passwort:</label>
-            <input type="password" id="password" name="password" required><br><br>
-            <button type="submit">Anmelden</button>
-        </form>
-
-        <script>
-            document.getElementById("loginForm").addEventListener("submit", async (e) => {
-                e.preventDefault();
-                
-                let formData = new FormData(e.target);
-                let response = await fetch("/login", {
-                    method: "POST",
-                    body: new URLSearchParams(formData),
-                    credentials: "include"
-                });
-
-                if (response.ok) {
-                    window.location.href = "/dashboard";
-                } else {
-                    alert("Falsches Passwort!");
-                }
-            });
-        </script>
-    </body>
-</html>
\ No newline at end of file
+%{login}%
diff --git a/src/main/resources/html/site/login.html b/src/main/resources/html/site/login.html
index ac0ab38..91fae45 100644
--- a/src/main/resources/html/site/login.html
+++ b/src/main/resources/html/site/login.html
@@ -1,37 +1 @@
-<!DOCTYPE html>
-<html lang="de">
-    <head>
-        <meta charset="UTF-8">
-        <title>Login</title>
-        <link rel="stylesheet" href="style.css">
-    </head>
-    <body>
-        <h1>Login</h1>
-        <form id="loginForm">
-            <label for="username">Benutzername:</label>
-            <input type="text" id="username" name="username" required><br><br>
-            <label for="password">Passwort:</label>
-            <input type="password" id="password" name="password" required><br><br>
-            <button type="submit">Anmelden</button>
-        </form>
-
-        <script>
-            document.getElementById("loginForm").addEventListener("submit", async (e) => {
-                e.preventDefault();
-                
-                let formData = new FormData(e.target);
-                let response = await fetch("/login", {
-                    method: "POST",
-                    body: new URLSearchParams(formData),
-                    credentials: "include"
-                });
-
-                if (response.ok) {
-                    window.location.href = "/dashboard";
-                } else {
-                    alert("Falsches Passwort!");
-                }
-            });
-        </script>
-    </body>
-</html>
\ No newline at end of file
+%{login}%
diff --git a/src/main/resources/templates/html/login.html b/src/main/resources/templates/html/login.html
new file mode 100644
index 0000000..0e766b1
--- /dev/null
+++ b/src/main/resources/templates/html/login.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Login</title>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <style>
+        body {
+            margin: 0;
+            font-family: Arial, Helvetica, sans-serif;
+            background-color: #f5f7fb;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+        }
+
+        .login-container {
+            background: #ffffff;
+            padding: 32px;
+            border-radius: 8px;
+            width: 100%;
+            max-width: 360px;
+            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+        }
+
+        h2 {
+            text-align: center;
+            margin-bottom: 24px;
+            color: #333;
+        }
+
+        label {
+            display: block;
+            margin-bottom: 6px;
+            font-weight: 600;
+            color: #444;
+        }
+
+        input {
+            width: 100%;
+            padding: 10px;
+            margin-bottom: 16px;
+            border-radius: 4px;
+            border: 1px solid #ccc;
+            font-size: 14px;
+        }
+
+        button {
+            width: 100%;
+            padding: 10px;
+            background-color: #3f51b5;
+            color: #ffffff;
+            border: none;
+            border-radius: 4px;
+            font-size: 16px;
+            cursor: pointer;
+        }
+
+        button:hover {
+            background-color: #303f9f;
+        }
+    </style>
+</head>
+<body>
+
+<div class="login-container">
+    <h2>Login</h2>
+
+    <form id = "loginForm" method="post" action="/login">
+        <label for="username">Username</label>
+        <input id="username" name="username" type="text" required>
+
+        <label for="password">Password</label>
+        <input id="password" name="password" type="password" required>
+
+        <button type="submit">Login</button>
+    </form>
+</div>
+<script> 
+     document.getElementById("loginForm").addEventListener("submit", async (e) => { 
+         e.preventDefault(); 
+          
+         let formData = new FormData(e.target); 
+         let response = await fetch("/login", { 
+             method: "POST", 
+             body: new URLSearchParams(formData), 
+             credentials: "include" 
+         }); 
+  
+         if (response.ok) { 
+             window.location.href = "/dashboard"; 
+         } else { 
+             alert("Falsches Passwort!"); 
+         } 
+     }); 
+ </script> 
+</body>
+</html>
