diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html
index b4592343..c10efb7a 100644
--- a/symposion/templates/schedule/_grid.html
+++ b/symposion/templates/schedule/_grid.html
@@ -10,28 +10,12 @@
             <td class="time">{{ row.time|date:"h:iA" }}</td>
             {% for slot in row.slots %}
                 <td class="slot" colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}">
-                    <span class="schedule-controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "plenary" #}" rel="facebox">plenary</a> | <a href="{# url schedule_slot_add slot.pk "break" #}" rel="facebox">break</a> | <a href="{# url schedule_slot_add slot.pk "presentation" #}" rel="facebox">presentation</a></span>
-                </td>
-                {% comment %}
-                <td colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}" class="slot {{ slot.kind.name }} rowspan-{{ slot.rowspan }} colspan-{{ slot.colspan }}">
-                    {% if not slot.content %}
-                        <span class="controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "plenary" #}" rel="facebox">plenary</a> | <a href="{# url schedule_slot_add slot.pk "break" #}" rel="facebox">break</a> | <a href="{# url schedule_slot_add slot.pk "presentation" #}" rel="facebox">presentation</a>/span>
+                    {% if slot.kind.label == "talk" %}
+                        <span class="schedule-controls"><b>add</b>: <a href="{# url schedule_slot_add slot.pk "talk" #}" rel="facebox">talk</a></span>
                     {% else %}
-                        {% if slot.kind.name == "recess" %}
-                            <div class="title">{{ slot.content.title }}</div>
-                        {% else %}
-                            {% if slot.kind.name == "plenary" %}
-                                <div class="title">{{ slot.content.title }}</div>
-                                <div class="speaker">{{ slot.content.speaker }}</div>
-                            {% else %}
-                                <div class="title">{{ slot.content.title }}</div>
-                                <div class="speaker">{{ slot.content.speaker }}</div>
-                            {% endif %}
-                        {% endif %}
-                        <span class="controls"><b>actions</b>: <a href="{# url schedule_slot_edit slot.pk #}" rel="facebox">edit</a><a href="{#url schedule_slot_remove slot.pk #}" rel="facebox">remove</a></span>
+                        {{ slot.kind.label }}
                     {% endif %}
                 </td>
-                {% endcomment %}
             {% endfor %}
         </tr>
     {% endfor %}