diff --git a/nsupdate/main/templates/main/home.html b/nsupdate/main/templates/main/home.html
index 3895146..c551a98 100644
--- a/nsupdate/main/templates/main/home.html
+++ b/nsupdate/main/templates/main/home.html
@@ -1,8 +1,31 @@
 {% extends "base.html" %}
 {% load bootstrap %}
+{% load static %}
+
+{% block header %}
+
+  <div class="jumbotron">
+      <div class="container">
+        {% if request.session.ipv4 %}
+                <h1>{{request.session.ipv4}}</h1>
+        {% endif %}
+        {% if request.session.ipv6 %}
+            <h1>{{request.session.ipv6}}</h1>
+        {% endif %}
+        <p>Free and Open Source Dynamic DNS service for you. Developed in under 48h for the <a href="http://djangodash.com/">Django-Dash 2013</a>.</p>
+        <p>
+<iframe src="http://ghbtns.com/github-btn.html?user=asmaps&repo=nsupdate.info&type=watch&count=true"
+  allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
+        </p>
+      </div>
+    </div>
+
+
+{% endblock %}
 
 {% block content %}
-<div class="row" style="background-color: #DDDDDD">
+
+<div class="row">
     <div class="col-sm-4" style="text-align: center">
         <h1><i class="icon-globe icon-3x"></i></h1>
         <h3>World Wide Web</h3>
@@ -27,17 +50,54 @@
 </div>
 <hr>
 <div class="row">
-      <div class="container">
-        {% if request.session.ipv4 %}
-            <h1>Your IPv4 address: {{request.session.ipv4}}</h1>
-        {% else %}
-            <h1>Your IPv4 address: unknown</h1>
-        {% endif %}
-        {% if request.session.ipv6 %}
-            <h1>Your IPv6 address: {{request.session.ipv6}}</h1>
-        {% else %}
-            <h1>Your IPv6 address: unknown</h1>
-        {% endif %}
+        <div class="col-lg-3">
+
+            <div class="well well-sm">
+                <h3>We had a lot of fun</h3>
+                <p>
+                    <i class="icon icon-ok"></i> Open-Source<br>
+                    <i class="icon icon-ok"></i> Easy to use<br>
+                    <i class="icon icon-ok"></i> Fast and Awesome<br>
+                    <i class="icon icon-ok"></i> Funny List<br>
+                    <i class="icon icon-ok"></i> Built in 48h<br>
+                    <i class="icon icon-ok"></i> Probably no Bugs<br>
+                </p>
+                <p>Follow the white rabbit...</p>
+            </div>
+
+
+        </div>
+        <div class="col-lg-3">
+
+            <div class="well well-sm">
+                <h3>Another List</h3>
+                <p>
+                    I have no idea what I am doing.
+                </p>
+            </div>
+        </div>
+        <div class="col-lg-6">
+            <div class="well well-sm">
+                <h3>Screenshots</h3>
+                <a id="screenshots_url" href="{% static 'screenshots/overview.png' %}">
+                    <img id="screenshots" src="{% static 'screenshots/overview.png' %}" class="img-responsive" alt="Responsive image">
+                </a>
+                <script>
+                var id = 0;
+                var srcs = Array("{% static 'screenshots/hostview.png' %}","{% static 'screenshots/help.png' %}","{% static 'screenshots/overview.png' %}","{% static 'screenshots/generatesecret.png' %}");
+                setInterval(function(){
+                    $('#screenshots').attr('src', srcs[id]);
+                    $('#screenshots_url').attr('href', srcs[id]);
+                    id += 1;
+                    if(id>=srcs.length) {
+                        id=0;
+                    }
+                },5000);
+                    
+                </script>
+            </div>
+        </div>
     </div>
-</div>
+
+<hr>
 {% endblock %}
diff --git a/nsupdate/main/templates/main/host.html b/nsupdate/main/templates/main/host.html
index 21971fe..f7fd08c 100644
--- a/nsupdate/main/templates/main/host.html
+++ b/nsupdate/main/templates/main/host.html
@@ -15,7 +15,7 @@
             </form>
         </div>
         <div  class="col-lg-4">
-            <h3>Generate new secret</h3>
+            <h3>Generate New Secret</h3>
             <p>We store your update secret salted and hashed, so if you forget or lose it you will have to create a new one.</p>
             <form action="{% url 'generate_secret_view' host.pk %}" method="get">
                 <button type="submit" class="btn btn-primary">Generate New</button>
diff --git a/nsupdate/nsupdate/static/screenshots/generatesecret.png b/nsupdate/nsupdate/static/screenshots/generatesecret.png
new file mode 100644
index 0000000..e0aee2d
Binary files /dev/null and b/nsupdate/nsupdate/static/screenshots/generatesecret.png differ
diff --git a/nsupdate/nsupdate/static/screenshots/help.png b/nsupdate/nsupdate/static/screenshots/help.png
new file mode 100644
index 0000000..f956f14
Binary files /dev/null and b/nsupdate/nsupdate/static/screenshots/help.png differ
diff --git a/nsupdate/nsupdate/static/screenshots/hostview.png b/nsupdate/nsupdate/static/screenshots/hostview.png
new file mode 100644
index 0000000..ad0c7ed
Binary files /dev/null and b/nsupdate/nsupdate/static/screenshots/hostview.png differ
diff --git a/nsupdate/nsupdate/static/screenshots/overview.png b/nsupdate/nsupdate/static/screenshots/overview.png
new file mode 100644
index 0000000..c516d8e
Binary files /dev/null and b/nsupdate/nsupdate/static/screenshots/overview.png differ
diff --git a/nsupdate/nsupdate/templates/base.html b/nsupdate/nsupdate/templates/base.html
index 3973382..6f708b0 100644
--- a/nsupdate/nsupdate/templates/base.html
+++ b/nsupdate/nsupdate/templates/base.html
@@ -63,6 +63,7 @@
                 </div>
             </div>
         </div>
+        {% block header %}{% endblock %}
         <div class="container content wrap">
             <div class="row">
                 <div class="col-lg-12">