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
@@ -9,7 +9,7 @@
 <div class="row">
   <h1 class="span12">{{entity.name}}</h1>
 </div>
-<hr>
+<hr />
 
 {% if entity.description %}
 <div class="row">
@@ -17,7 +17,7 @@
     {{entity.description}}
   </div>
 </div>
-<hr>
+<hr />
 {% endif %}
 
 <div class="row">
@@ -28,7 +28,7 @@
   </div>
 </div>
 
-<hr>
+<hr />
 
 <div class="row">
 
@@ -91,7 +91,7 @@
       <div>
         {% with entity_id=entity.id|slugify %}
         {% url "entity" entity.id as next %}
-        {% html_link "Add communication" "communication_create" class="btn btn-primary btn-mini" get="to_entity="|add:entity_id|add:"&next="|add:next %}
+        {% html_link "Add communication" "communication_create" class="btn btn-primary btn-mini" get="to_entity="|add:entity_id|add:"&amp;next="|add:next %}
         {% endwith %}
       </div>
     </div>
@@ -116,7 +116,7 @@
       <div>
         {% with entity_id=entity.id|slugify %}
         {% url "entity" entity.id as next %}
-        {% html_link "Add communication" "communication_create" class="btn btn-primary btn-mini" get="from_entity="|add:entity_id|add:"&next="|add:next %}
+        {% html_link "Add communication" "communication_create" class="btn btn-primary btn-mini" get="from_entity="|add:entity_id|add:"&amp;next="|add:next %}
         {% endwith %}
       </div>
     </div>