diff --git a/conntrackt/templates/conntrackt/entity_detail.html b/conntrackt/templates/conntrackt/entity_detail.html
--- a/conntrackt/templates/conntrackt/entity_detail.html
+++ b/conntrackt/templates/conntrackt/entity_detail.html
@@ -11,9 +11,18 @@
 <div class="row">
   <h1 class="span12">{{entity.name}}</h1>
 </div>
-<hr>
+
+{% if entity.description %}
 <div class="row">
   <div class="span12">
+    {{entity.description}}
+  </div>
+</div>
+<hr>
+{% endif %}
+<div class="row">
+  <div class="span12">
+    {% html_link "Edit" "entity_update" entity.id class="btn btn-primary" %}
     {% html_link "Remove" "entity_delete" entity.id class="btn btn-primary" %}
   </div>
 </div>