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,7 +11,7 @@
 <h1>{{entity.name}}</h1>
 <dl>
   <dt>Project</dt><dd>{% html_link project.name 'project'  project.id  %}</dd>
-  <dt>Location</dt><dd>{% html_link location.name 'location' location.id %}</dd>
+  <dt>Location</dt><dd>{{location.name}}</dd>
   <dt>Incoming communications</dt><dd><ul class="unstyled">{% for interface in entity.interface_set.all %}
     {% for communication in interface.destination_set.all %}
     <li>{{communication.source}} - {{communication.protocol}}: {{communication.port}}</li>
diff --git a/conntrackt/templates/conntrackt/project_widget.html b/conntrackt/templates/conntrackt/project_widget.html
--- a/conntrackt/templates/conntrackt/project_widget.html
+++ b/conntrackt/templates/conntrackt/project_widget.html
@@ -1,6 +1,6 @@
 {% load conntrackt %}
   <table class="table table-striped">
-    <tr><td><strong>{% html_link project.name 'project' project.id class="btn btn-link" title=project.description %}</strong></td><td>{% html_link '<i class="icon-book"></i>' 'project_iptables' project.id class="btn btn-link" %}</td></tr>
+    <tr><td><strong>{% html_link project.name 'project' project.id title=project.description %}</strong></td><td>{% html_link '<i class="icon-book"></i>' 'project_iptables' project.id class="btn btn-link" %}</td></tr>
 {% for entity in project.entity_set.all %}
     <tr><td>{% html_link entity.name 'entity' entity.id class="btn btn-link" %}</td><td>{% html_link '<i class="icon-list"></i>' 'entity_iptables' entity.id class="btn btn-link" %}</td></tr>
 {% endfor %}