diff --git a/conntrackt/templates/conntrackt/index.html b/conntrackt/templates/conntrackt/index.html
--- a/conntrackt/templates/conntrackt/index.html
+++ b/conntrackt/templates/conntrackt/index.html
@@ -18,6 +18,7 @@
 <div class="row">
   <div class="span12">
     {% html_link "Add project" "project_create" class="btn btn-primary" %}
+    {% html_link "Add location" "location_create" class="btn btn-primary" %}
   </div>
 </div>
 
@@ -28,20 +29,20 @@
   <div class="span6">
     <h2>Projects</h2>
     <div class="well">
-    {% if projects %}
-      <table class="table table-striped">
-        {% for project in projects %}
-          <tr>
-            <td style="width:99%">{% html_link project.name "project" project.id class="btn btn-link" %}</td>
-            <td>{% html_link '<i class="icon-list"></i>' "project_iptables" project.id class="btn btn-link" %}</td>
-            <td>{% html_link '<i class="icon-edit"></i>' "project_update" project.id class="btn btn-link" %}</td>
-            <td>{% html_link '<i class="icon-remove"></i>' "project_delete" project.id class="btn btn-link" %}</td>
-          </tr>
-        {% endfor %}
-      </table>
-    {% else %}
+      {% if projects %}
+        <table class="table table-striped">
+          {% for project in projects %}
+            <tr>
+              <td style="width:99%">{% html_link project.name "project" project.id class="btn btn-link" %}</td>
+              <td>{% html_link '<i class="icon-list"></i>' "project_iptables" project.id class="btn btn-link" %}</td>
+              <td>{% html_link '<i class="icon-edit"></i>' "project_update" project.id class="btn btn-link" %}</td>
+              <td>{% html_link '<i class="icon-remove"></i>' "project_delete" project.id class="btn btn-link" %}</td>
+            </tr>
+          {% endfor %}
+        </table>
+      {% else %}
       There are no projects defined.
-    {% endif %}
+      {% endif %}
     </div>     
   </div>
 
@@ -53,6 +54,8 @@
           {% for location in locations %}
             <tr>
               <td style="width:99%">{{location.name}}</td>
+              <td>{% html_link '<i class="icon-edit"></i>' "location_update" location.id class="btn btn-link" %}</td>
+              <td>{% html_link '<i class="icon-remove"></i>' "location_delete" location.id class="btn btn-link" %}</td>
             </tr>
           {% endfor %}
         </table>