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
@@ -24,9 +24,6 @@
     {% html_link "Edit" "entity_update" entity.id class="btn btn-primary" %}
     {% html_link "Remove" "entity_delete" entity.id class="btn btn-primary" %}
     {% html_link "Get Iptables" 'entity_iptables' entity.id class="btn btn-primary" %}
-    {% with entity_id=entity.id|slugify %}
-    {% html_link "Add interface" "interface_create" class="btn btn-primary" get="entity="|add:entity_id %}
-    {% endwith %}
   </div>
 </div>
 
@@ -35,12 +32,10 @@
 <div class="row">
 
   <div class="span6">
+    <h2>General information</h2>
     <div class="well">
       <table class="table table-striped">
         <tr>
-          <th colspan="2">General information</th>
-        </tr>
-        <tr>
           <th>Project</th><td style="width:99%">{% html_link project.name 'project'  project.id  %}</td>
         </tr>
         <tr>
@@ -51,56 +46,86 @@
   </div>
 
   <div class="span6">
+    <h2>Interfaces</h2>
     <div class="well">
+      {% if interfaces %}
       <table class="table table-striped">
-        <tr>
-          <th colspan="3">Interfaces</th>
-        </tr>
         {% for interface in interfaces %}
-          <tr>
-            <td style="width:99%">{{interface.name}} ({{interface.address}}/{{interface.netmask}})</td>
-            <td>{% html_link '<i class="icon-edit"></i>' 'interface_update' interface.id class="btn btn-link"  %}</td>
-            <td>{% html_link '<i class="icon-remove"></i>' 'interface_delete' interface.id class="btn btn-link"  %}</td>
-          </tr>
+        <tr>
+          <td style="width:99%"><p>{{interface.name}} ({{interface.address}}/{{interface.netmask}})</p></td>
+          <td>{% html_link '<i class="icon-edit"></i>' 'interface_update' interface.id class="btn btn-link"  %}</td>
+          <td>{% html_link '<i class="icon-remove"></i>' 'interface_delete' interface.id class="btn btn-link"  %}</td>
+        </tr>
         {% endfor %}
       </table>
+      {% else %}
+      <p>No interfaces are defined for this entity.</p>
+      {% endif %}
+      <div>
+        {% with entity_id=entity.id|slugify %}
+        {% html_link "Add interface" "interface_create" class="btn btn-primary btn-mini" get="entity="|add:entity_id %}
+        {% endwith %}
+      </div>
     </div>
   </div>
 </div>
 
 <div class="row">
   <div class="span6">
+    <h2>Incoming communications</h2>
     <div class="well">
+      {% if incoming_communications %}
       <table class="table table-striped">
+        {% for comm in incoming_communications %}
         <tr>
-          <th>Incoming communications</th>
+          <td style="width:99%">{% html_link comm.source_representation "entity" comm.source.entity.id class="btn btn-link" %}</td>
+          <td>{% html_link '<i class="icon-edit"></i>' 'communication_update' comm.id class="btn btn-link"  %}</td>
+          <td>{% html_link '<i class="icon-remove"></i>' 'communication_delete' comm.id class="btn btn-link"  %}</td>
         </tr>
-        {% for comm in incoming_communications %}
-          <tr><td>{{comm.source}} - {{comm.protocol}}: {{comm.port}}</td></tr>
         {% endfor %}
       </table>
+      {% else %}
+      <p>No incoming communications towards this entity.</p>
+      {% endif %}
+      <div>
+        {% with entity_id=entity.id|slugify %}
+        {% html_link "Add communication" "communication_create" class="btn btn-primary btn-mini" get="to_entity="|add:entity_id %}
+        {% endwith %}
+      </div>
     </div>
   </div>
 
   <div class="span6">
+    <h2>Outgoing communications</h2>
     <div class="well">
+      {% if outgoing_communications %}
       <table class="table table-striped">
-        <tr>
-          <th>Outgoing communications</th>
-        </tr>
         {% for comm in outgoing_communications %}
-          <tr><td>{{comm.destination}} - {{comm.protocol}}: {{comm.port}}</td></tr>
+        <tr>
+          <td style="width:99%">{% html_link comm.destination_representation "entity" comm.destination.entity.id class="btn btn-link" %}</td>
+          <td>{% html_link '<i class="icon-edit"></i>' 'communication_update' comm.id class="btn btn-link"  %}</td>
+          <td>{% html_link '<i class="icon-remove"></i>' 'communication_delete' comm.id class="btn btn-link"  %}</td>
+        </tr>
         {% endfor %}
-        <tr>
-        </tr>
       </table>
+      {% else %}
+      <p>No outgoing communications from this entity.</p>
+      {% endif %}
+      <div>
+        {% with entity_id=entity.id|slugify %}
+        {% html_link "Add communication" "communication_create" class="btn btn-primary btn-mini" get="from_entity="|add:entity_id %}
+        {% endwith %}
+      </div>
     </div>
   </div>
 
   <div class="span12">
-    <div>
-      <p><strong>Iptables rules</strong></p>
+    <h2>Iptables rules</h2>
+    <div class="well">
       <pre>{{ entity_iptables }}</pre>
+      <div>
+        {% html_link "Download" 'entity_iptables' entity.id class="btn btn-primary" %}
+      </div>
     </div>
   </div>