diff --git a/src/c3nav/editor/templates/editor/mapitems.html b/src/c3nav/editor/templates/editor/mapitems.html
index f5c33ff1..1ffe4e20 100644
--- a/src/c3nav/editor/templates/editor/mapitems.html
+++ b/src/c3nav/editor/templates/editor/mapitems.html
@@ -1,12 +1,17 @@
 {% load bootstrap3 %}
 
+<a class="btn btn-default btn-sm pull-right " href="{% url 'editor.mapitems.add' mapitem_type=mapitem_type %}">Add new</a>
 <h3>{{ title }}{% if has_level %} <small>on level {{ level }}</small>{% endif %}</h3>
-<p><a href="{% url 'editor.mapitemtypes' level='LEVEL' %}" data-insert-level>&laquo; Back</a><p>
-<p><a href="{% url 'editor.mapitems.add' mapitem_type=mapitem_type %}">Add new</a><p>
 
 <table class="table table-condensed itemtable" data-mapitem-type="{{ mapitem_type }}">
     <tbody>
         {% for item in items %}
+            {% if forloop.counter0|divisibleby:10 %}
+                <tr>
+                    <td><a href="{% url 'editor.mapitemtypes' level='LEVEL' %}" data-insert-level>&laquo; Back</a></td>
+                    <td></td>
+                </tr>
+            {% endif %}
             <tr name="{{ item.name }}">
                 <td>{{ item.name }}</td>
                 <td><a href="{% url 'editor.mapitems.edit' mapitem_type=mapitem_type name=item.name %}">Edit</a></td>