diff --git a/member/templates/details.html b/member/templates/details.html
index 0968d90..444c985 100644
--- a/member/templates/details.html
+++ b/member/templates/details.html
@@ -1,13 +1,13 @@
-<!DOCTYPE html>
-<html>
+{% extends "master.html" %}
 
-<body>
+{% block title %}
+  Details zu {{ mymember.firstname }} {{ mymember.lastname }}
+{% endblock %}
 
+{% block content %}
 <h1>{{ mymember.vorname }} {{ mymember.nachname }}</h1>
   
 <p>Geburtsdatum: {{ mymember.geburtsdatum }}</p>
 
 <p>Back to <a href="/members">Members</a></p>
-
-</body>
-</html>
+{% endblock %}
diff --git a/member/templates/master.html b/member/templates/master.html
new file mode 100644
index 0000000..1ef97a3
--- /dev/null
+++ b/member/templates/master.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>{% block title %}{% endblock %}</title>
+</head>
+<body>
+
+{% block content %}
+{% endblock %}
+
+</body>
+</html>
diff --git a/member/templates/memberlist.html b/member/templates/memberlist.html
index d88b0bb..c92c84c 100644
--- a/member/templates/memberlist.html
+++ b/member/templates/memberlist.html
@@ -1,9 +1,11 @@
-<!DOCTYPE html>
-<html>
-<body>
+{% extends "master.html" %}
 
-<h1>Members</h1>
-  
+{% block title %}
+  List of all persons
+{% endblock %}
+
+{% block content %}
+  <h1>Members</h1>
 <ul>
   {% for x in mymembers %}
   <li><a href="details/{{x.id}}"> {{ x.vorname }} {{ x.nachname }}</a></li>
@@ -12,5 +14,4 @@
   {% endfor %}
 </ul>
 
-</body>
-</html>
+{% endblock %}
