diff --git a/.gitignore b/.gitignore
index 4a73e55..89bbf08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ flask_session/
 /test/.pytest_cache/
 /test/flask_session/
 /Website/__pycache__/
-/Website/.pytest_cache/
\ No newline at end of file
+/Website/.pytest_cache/
+/.idea
\ No newline at end of file
diff --git a/Website/templates/addtag.html b/Website/templates/addtag.html
index 98b5c17..4d564ae 100644
--- a/Website/templates/addtag.html
+++ b/Website/templates/addtag.html
@@ -1,26 +1,25 @@
-<!DOCTYPE html>
-<html lang="en">
-   <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
-   <script type="text/javascript" charset="utf-8">
-        var socket = io();
-        var user = {{ user }}
-        socket.on('connect', function() {
-            socket.emit('addtag', {data: user});
-        });  
-        socket.on("busy", function(){
-            document.write('<p>the nfc reader is busy at the moment. Pleas Wait ...</p>')
-            socket.emit('addtag', {data: user})
-        });
-        socket.on("wait", function(){
-            document.write('<p>Pleas hold your tag on to the nfc reader</p>')
-        });
-        socket.on("error", function(data) {
-            alert(data)
-            window.location="http://matekasse.server.c3h/"
-        });
-        socket.on("finished", function(data){
-            alert(data)
-            window.location="http://matekasse.server.c3h/"
-        });
-   </script>
-</html>
\ No newline at end of file
+{% extends "base.html" %}
+{% block customscript %}
+<script type="text/javascript" charset="utf-8">
+    var socket = io();
+    var user = {{ user }}
+    socket.on('connect', function() {
+        socket.emit('addtag', {data: user});
+    });
+    socket.on("busy", function(){
+        document.write('<p>the nfc reader is busy at the moment. Pleas Wait ...</p>')
+        socket.emit('addtag', {data: user})
+    });
+    socket.on("wait", function(){
+        document.write('<p>Pleas hold your tag on to the nfc reader</p>')
+    });
+    socket.on("error", function(data) {
+        alert(data)
+        window.location="http://matekasse.server.c3h/"
+    });
+    socket.on("finished", function(data){
+        alert(data)
+        window.location="http://matekasse.server.c3h/"
+    });
+</script>
+{% endblock %}
diff --git a/Website/templates/adduser.html b/Website/templates/adduser.html
index a1a74e0..1d2c97a 100644
--- a/Website/templates/adduser.html
+++ b/Website/templates/adduser.html
@@ -1,8 +1,10 @@
-<!DOCTYPE html>
-<html lang="en">
-   <title>add user</title>
-   <p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p>
-   <p>
-    <form action="/adduser/user" method="post"><input name="username" type="search" placeholder="Username"><button>Add user</button></form>
-   </p>
-</html>
+{% extends "base.html" %}
+{% block title %}
+add user
+{% endblock %}
+{% block content %}
+<form action="/adduser/user" method="post"><input name="username" type="search" placeholder="Username">
+    <button>Add user</button>
+</form>
+</p>
+{% endblock %}
diff --git a/Website/templates/base.html b/Website/templates/base.html
index 0925b8d..07f8b40 100644
--- a/Website/templates/base.html
+++ b/Website/templates/base.html
@@ -1,17 +1,24 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <title>
-            {% block title %} {% endblock %} - FlaskApp
-        </title>
-    </head>
-    <body>
-        <nav>
-            <p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p>
-        </nav>
-        <hr>
-        <div class="conntent">
-            {% block content %} {% endblock %}
-        </div>
-    </body>
+<head>
+    <title>{% block title %}{% endblock %}</title>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js"
+            integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA=="
+            crossorigin="anonymous"
+    ></script>
+    <link rel="shortcut icon" type="Logo/png" href="ccc_logo.png"/>
+    {% block customscript %}{% endblock %}
+</head>
+<body>
+<nav>
+    <p><a href="/">index page</a>
+        | <a href="/list">user and tag list</a>
+        | <a href="/documentation">Documentation</a>
+    </p>
+</nav>
+<hr>
+<div class="conntent">
+    {% block content %} {% endblock %}
+</div>
+</body>
 </html>
\ No newline at end of file
diff --git a/Website/templates/change.html b/Website/templates/change.html
index c2d9635..e2d4a92 100644
--- a/Website/templates/change.html
+++ b/Website/templates/change.html
@@ -1,6 +1,5 @@
-<!DOCTYPE html>
-<html lang="en">
-   <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
+{% extends "base.html" %}
+{% block customscript %}
    <script type="text/javascript" charset="utf-8">
         var socket = io();
         var change = {{change}}
@@ -23,4 +22,4 @@
             window.location="http://matekasse.server.c3h/"
         });
    </script>
-</html>
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/Website/templates/confirmation.html b/Website/templates/confirmation.html
index b6b96e4..0c676e2 100644
--- a/Website/templates/confirmation.html
+++ b/Website/templates/confirmation.html
@@ -1,17 +1,16 @@
-<html>
-	<script src="/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
-        <script type="text/javascript" charset="utf-8">
-		if (confirm("{message}") == true) {
-			fetch("{{destination}}", {
-  				method: "POST",
-  				body: JSON.stringify({data}),
-  				headers: {
-    				"Content-type": "application/json; charset=UTF-8"
-  				}
-			})
-		}
-		else {
-			window.location="/list"
-		}
-	</script>
-</html>
+{% extends "base.html" %}
+{% block customscript %}
+<script type="text/javascript" charset="utf-8">
+    if (confirm("{message}") == true) {
+        fetch("{{destination}}", {
+            method: "POST",
+            body: JSON.stringify({data}),
+            headers: {
+                "Content-type": "application/json; charset=UTF-8"
+            }
+        })
+    } else {
+        window.location = "/list"
+    }
+</script>
+{% endblock %}
diff --git a/Website/templates/documentation.html b/Website/templates/documentation.html
index d290e17..16c3c95 100644
--- a/Website/templates/documentation.html
+++ b/Website/templates/documentation.html
@@ -1,16 +1,11 @@
-<html>
-    
-    <head>
-        <title>Documentation</title>
-        <link rel="stylesheet" type="text/css" href="documentation.css">
-        <link rel="shortcut icon" type="Logo/png" href="ccc_logo.png"/>
-    </head>
-    
-    <body>
-        <div id="Infos">
-            <p> <a href="/">index page</a> | <a href="/list">user and tag list</a></p>
-            <p><a href="https://hannover.ccc.de/gitlab/anton/matekasse">https://hannover.ccc.de/gitlab/anton/matekasse</a></p>
-        </div>
+{% extends "base.html" %}
+{% block title %}
+Documentation
+{% endblock %}
+{% block customscript %}
+<link rel="stylesheet" type="text/css" href="documentation.css">
+{% endblock %}
+{% block content %}
         <h1 class="header"> <u>Documentation</u> </h1>
         
         <p>&nbsp;</p> 
@@ -46,6 +41,4 @@
 	    <p>638: Wrong Input</p>
             <P>418: I'm a teapot</P>
         </div>
-    </body>
-
-</html>
+{% endblock %}
diff --git a/Website/templates/error.html b/Website/templates/error.html
index 00fb406..08b73df 100644
--- a/Website/templates/error.html
+++ b/Website/templates/error.html
@@ -1,8 +1,8 @@
-<!DOCTYPE html>
-<html lang="en">
-   <title>Error</title>
-   <p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p>
-   <p>
+{% extends "base.html" %}
+{% block title %}Error{% endblock %}
+{% block customscript %}
+<p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p>
+<p>
     Error: {{error_code}}
-   </p>
-</html>
\ No newline at end of file
+</p>
+{% endblock %}
\ No newline at end of file
diff --git a/Website/templates/index.html b/Website/templates/index.html
index 75f4c32..68e5bbc 100644
--- a/Website/templates/index.html
+++ b/Website/templates/index.html
@@ -1,11 +1,12 @@
-<html>
-	<a href="/list">user and tag list</a> 
+{% extends "base.html" %}
+{% block customscript %}
+<script type="text/javascript" charset="utf-8">
+	window.location="/list"
+</script>
+{% endblock %}
+{% block content %}
+<a href="/list">user and tag list</a>
 	<p>The creator of this website accepts no liability for any linguistic or technical errors!</p>
 	<br style="line-height: 500%;"></br>
 	<a href="/documentation">Doumentation</a>
-	<script src="/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous">
-	</script>
-        <script type="text/javascript" charset="utf-8">
-            window.location="/list"
-	</script>
-</html>
+{% endblock %}
diff --git a/Website/templates/list.html b/Website/templates/list.html
index e03038e..6196ea5 100644
--- a/Website/templates/list.html
+++ b/Website/templates/list.html
@@ -1,29 +1,35 @@
-<!DOCTYPE html>
-<html lang="en-150">
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
-        <script type="text/javascript" charset="utf-8">
-        	var socket = io();
-                socket.on("update", function(){
-                    window.location="http://matekasse.server.c3h/list"
-                });
-        </script>
-        <title>Strichliste</title>
-        <p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p>
-        <form action="/list/user" method="get"><input name="user" type="search" placeholder="Search for user"><button>Search</button></form>
-        <form action="/adduser" method="post"><button type="submit">Add User</button></form> 
-        <br></br>
-	{% for i in users %}
-		<form action="/change" method="post" style="display: inline;">
-			<p style="display: inline;">
-			<a href="list/user?id={{i[0]}}">{{i[1]|safe}}</a>: {{i[2]/100}}€
-			</p>
-			<input name="id" type="hidden" value="{{i[0]}}"> 
-			<input name="change" type="number" lang="nb" step="0.01"  placeholder="add to balance">
-		</form>
-		<form action="/change" method="post" style="display: inline">
-			<input name="id" type="hidden" value="{{i[0]}}">
-			<button type="submit" name="change" value=-{{preis}}>-{{preis}}€</button>
-		</form>
-		<br style="line-height: 50%;"></br>
-	{% endfor %}
-</html>
+{% extends "base.html" %}
+{% block title %}
+Strichliste
+{% endblock %}
+{% block customscript %}
+<script type="text/javascript" charset="utf-8">
+    var socket = io();
+    socket.on("update", function () {
+        window.location = "http://matekasse.server.c3h/list"
+    });
+</script>
+{% endblock %}
+{% block content %}
+<form action="/list/user" method="get"><input name="user" type="search" placeholder="Search for user">
+    <button>Search</button>
+</form>
+<form action="/adduser" method="post">
+    <button type="submit">Add User</button>
+</form>
+<br></br>
+{% for i in users %}
+<form action="/change" method="post" style="display: inline;">
+    <p style="display: inline;">
+        <a href="list/user?id={{i[0]}}">{{i[1]|safe}}</a>: {{i[2]/100}}€
+    </p>
+    <input name="id" type="hidden" value="{{i[0]}}">
+    <input name="change" type="number" lang="nb" step="0.01" placeholder="add to balance">
+</form>
+<form action="/change" method="post" style="display: inline">
+    <input name="id" type="hidden" value="{{i[0]}}">
+    <button type="submit" name="change" value=-{{preis}}>-{{preis}}€</button>
+</form>
+<br style="line-height: 50%;"></br>
+{% endfor %}
+{% endblock %}
diff --git a/Website/templates/redirect.html b/Website/templates/redirect.html
index 9848c78..089634e 100644
--- a/Website/templates/redirect.html
+++ b/Website/templates/redirect.html
@@ -1,8 +1,12 @@
-<html>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
-        <script type="text/javascript" charset="utf-8">
-                    window.location="/list";
-        </script>
-        <p>redirekting</p>
-	<a href="/list">destination</a>
-</html>
+{% extends "base.html" %}
+{% block title %}
+{% endblock %}
+{% block content %}
+<p>redirekting</p>
+<a href="/list">destination</a>
+{% endblock %}
+{% block customscript %}
+<script type="text/javascript" charset="utf-8">
+    window.location = "/list";
+</script>
+{% endblock %}
diff --git a/Website/templates/removetag.html b/Website/templates/removetag.html
index f84d34d..42b87d7 100644
--- a/Website/templates/removetag.html
+++ b/Website/templates/removetag.html
@@ -1,7 +1,6 @@
-<!DOCTYPE html>
-<html lang="en">
-   <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
-   <script type="text/javascript" charset="utf-8">
+{% extends "base.html" %}
+{% block customscript %}
+<script type="text/javascript" charset="utf-8">
         var socket = io();
         var user = {{ user }}
         socket.on('connect', function() {
@@ -23,4 +22,4 @@
             window.location="http://matekasse.server.c3h/"
         });
    </script>
-</html>
\ No newline at end of file
+{% endblock %}
diff --git a/Website/templates/removeuser.html b/Website/templates/removeuser.html
index b6c9ea6..1e2031d 100644
--- a/Website/templates/removeuser.html
+++ b/Website/templates/removeuser.html
@@ -1,9 +1,10 @@
-<html>
-	<title>remove user</title>
+{% extends "base.html" %}
+{% block title %}
+	remove user
+{% endblock %}
+{% block content %}
 	<p>
-		<p>
-			<a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a>
-		</p> 
 		<p>Deleted user {{user_name|safe}}</p>
 		<a href="/list">return to the tags and user list</a>
 	</p>
+{% endblock %}
diff --git a/Website/templates/user.html b/Website/templates/user.html
index 4bafdf4..eca6f5f 100644
--- a/Website/templates/user.html
+++ b/Website/templates/user.html
@@ -1,39 +1,45 @@
-<!DOCTYPE html>
-<html lang="en-150">
-                <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
-                <script type="text/javascript" charset="utf-8">
-                	var socket = io();
-        		socket.on("update", function(){ window.location="/list/user?id={{user[0]}}"});
-                </script>
-		<title>{{user[1]|safe}}</title>
-                <p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p>
-		<p> {{user[1]|safe}} : {{user[2]/100}}€ <p>
-                <form action="/addtag" method="post">
-			<input name="id" type="hidden" value="{{user[0]}}">
-			<button type="submit">Add Tag</button>
-		</form>
-                <form action="/removetag" method="post">
-			<input name="id" type="hidden" value="{{user[0]}}">
-			<button type="submit">Remove Tag</button>
-		</form>
-                </p>
-		<form action="/change" method="post">
-			<input name="id" type="hidden" value="{{user[0]}}"> 
-			<input name="change" type="number" lang="nb" step="0.01" placeholder="change balance">
-		</form>
-                </p>
-                <br></br>
-                <p>Tags:</p>
-		{% for tag in tags %}
-                	<p>
-				<form action="/removetag" method="post">
-					<label for="removetag">{{tag[0]}} </label>
-					<input name="id" type="hidden" value="{{user[0]}}">
-					<input name="tagid" type="hidden" value="{{tag[0]}}">
-					<button id="removetag" type="submit">Remove Tag</button>
-				</form> 
-			</p>
-		{% endfor %}
-                <br></br>
-		<form action="/removeuser" method="post"><input name="id" type="hidden" value="{{user[0]}}"><button type="submit">Remove User</button></form>
-</html>
+{% extends "base.html" %}
+{% block customscript %}
+<script type="text/javascript" charset="utf-8">
+    var socket = io();
+    socket.on("update", function () {
+        window.location = "/list/user?id={{user[0]}}"
+    });
+</script>
+{% endblock %}
+{% block title %}
+    {{user[1]|safe}}
+{% endblock %}
+{% block content %}
+<p> {{user[1]|safe}} : {{user[2]/100}}€ <p>
+<form action="/addtag" method="post">
+    <input name="id" type="hidden" value="{{user[0]}}">
+    <button type="submit">Add Tag</button>
+</form>
+<form action="/removetag" method="post">
+    <input name="id" type="hidden" value="{{user[0]}}">
+    <button type="submit">Remove Tag</button>
+</form>
+</p>
+<form action="/change" method="post">
+    <input name="id" type="hidden" value="{{user[0]}}">
+    <input name="change" type="number" lang="nb" step="0.01" placeholder="change balance">
+</form>
+</p>
+<br></br>
+<p>Tags:</p>
+{% for tag in tags %}
+<p>
+    <form action="/removetag" method="post">
+        <label for="removetag">{{tag[0]}} </label>
+        <input name="id" type="hidden" value="{{user[0]}}">
+        <input name="tagid" type="hidden" value="{{tag[0]}}">
+        <button id="removetag" type="submit">Remove Tag</button>
+    </form>
+</p>
+{% endfor %}
+<br></br>
+<form action="/removeuser" method="post"><input name="id" type="hidden" value="{{user[0]}}">
+    <button type="submit">Remove User</button>
+</form>
+{% endblock %}
