diff --git a/frontend/static/images/logo.png b/frontend/static/images/logo.png
index 5fcc0bf..1ccd14d 100644
Binary files a/frontend/static/images/logo.png and b/frontend/static/images/logo.png differ
diff --git a/frontend/templates/layout/base.html b/frontend/templates/layout/base.html
index 564ae56..04809fd 100644
--- a/frontend/templates/layout/base.html
+++ b/frontend/templates/layout/base.html
@@ -17,7 +17,7 @@
 	<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
 		<div class="container">
 			<div class="navbar-header">
-				<a class="navbar-brand" href="/">{{page.name}}</a>
+				<a class="navbar-brand" href="/"><img src="{% static 'images/logo.png' %}"> {{page.name}}</a>
 				<ul class="nav navbar-nav">
 					<li><a href="/">Index</a></li>
 					<li><a href="/register">Register</a></li>
@@ -34,14 +34,16 @@
 	</nav>
 	<div class="page-header">
 		<div id="header" class="container">
-			<h1>{{page.title}}</h1>
+			{% block header %}<h1>{{page.title}}</h1>{% endblock %}
 		</div>
 	</div>
 	<div id="content" class="container">
 		{% block content %}{% endblock %}
 	</div>
-	<div id="footer">
-		{% block footer %}{% endblock %}
+	<div id="footer" class="footer">
+		<div class="container">
+			<p class="text-muted">{% block footer %}This software proudly presented by: <a href="http://hs-hannocer.de">Hochschule Hannover</a>{% endblock %}</p>
+		</div>
 	</div>
 	</body>
 </html>
\ No newline at end of file