diff --git a/nsupdate/main/models.py b/nsupdate/main/models.py
index bf07daa..e9ebeaa 100644
--- a/nsupdate/main/models.py
+++ b/nsupdate/main/models.py
@@ -14,7 +14,7 @@ class Host(models.Model):
     created_by = models.ForeignKey(User)
 
     def __unicode__(self):
-        return u"%s (%s)" % (self.fqdn, self.created_by)
+        return u"%s - %s" % (self.fqdn, self.comment)
 
 
 
diff --git a/nsupdate/main/templates/main/delete_host.html b/nsupdate/main/templates/main/delete_host.html
index 57d7b98..cbb2186 100644
--- a/nsupdate/main/templates/main/delete_host.html
+++ b/nsupdate/main/templates/main/delete_host.html
@@ -4,8 +4,8 @@
 {% block content %}
 
     <div class="row">
-         <div class="col-lg-4">
-            <h3>Delete Host <small><a href="{% url 'overview' %}"><i class="icon-double-angle-left"></i> back to overview</a></small></h3>
+         <div class="col-lg-8">
+            <h3>Delete Horst <small><a href="{% url 'overview' %}"><i class="icon-double-angle-left"></i> back to overview</a></small></h3>
             <form action="" method="post">
                 {% csrf_token %}
                 <p>Are you sure you want to delete "{{ object }}"?</p>
diff --git a/nsupdate/main/templates/main/host.html b/nsupdate/main/templates/main/host.html
index c4d8bee..b300056 100644
--- a/nsupdate/main/templates/main/host.html
+++ b/nsupdate/main/templates/main/host.html
@@ -6,7 +6,7 @@
     <div class="row">
         
          <div class="col-lg-4">
-            <h3>Edit Host <small><a href="{% url 'overview' %}"><i class="icon-double-angle-left"></i> back to overview</a></small></h3>
+            <h3>Edit Horst <small><a href="{% url 'overview' %}"><i class="icon-double-angle-left"></i> back to overview</a></small></h3>
             <form method="post" action="">
                 {% csrf_token %}
                 {{ form|bootstrap }}
diff --git a/nsupdate/nsupdate/static/favicon.png b/nsupdate/nsupdate/static/favicon.png
index 9351e0c..a20b4eb 100644
Binary files a/nsupdate/nsupdate/static/favicon.png and b/nsupdate/nsupdate/static/favicon.png differ