diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html
index 722b0b7f..b4592343 100644
--- a/symposion/templates/schedule/_grid.html
+++ b/symposion/templates/schedule/_grid.html
@@ -1,4 +1,4 @@
-<table class="table">
+<table class="table table-bordered table-condensed">
     <tr>
         <th>&nbsp;</th>
         {% for room in timetable.rooms %}
@@ -9,8 +9,8 @@
         <tr>
             <td class="time">{{ row.time|date:"h:iA" }}</td>
             {% for slot in row.slots %}
-                <td colspan="{{ slot.colspan }}" rowspan="{{ slow.rowspan }}">
-                        <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>
+                <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 }}">
diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html
index e5cd80f1..75c5f799 100644
--- a/symposion/templates/schedule/schedule_edit.html
+++ b/symposion/templates/schedule/schedule_edit.html
@@ -10,29 +10,34 @@
 {% block extra_head %}
     <link rel="stylesheet" href="{{ STATIC_URL }}css/facebox.css" />
     <style>
-    /*
-        body {
-            font-family: "Helvetica Neue", Arial, "Helvetica";
-        }
-        #wrapper {
-            width: 960px;
-        }
-        table {
-            border-collapse: collapse;
-            font-weight: normal;
-            line-height: 1.1em;
-        }
         td {
-            padding: 4px 8px;
-            border: 1px solid #666;
-            vertical-align: top;
+            font-size: 9pt;
         }
         td.slot {
             text-align: center;
-            background: #FFF;
-            font-size: 10pt;
-            width: 180px;
+            vertical-align: middle;
         }
+        td.time {
+            vertical-align: top;
+            width: 50px;
+            font-size: 8pt;
+            padding-top: 0;
+        }
+        td.slot:hover .schedule-controls {
+            display: block;
+        }
+        .schedule-controls {
+            display: none;
+            font-size: 8pt;
+        }
+        .schedule-controls a {
+            text-decoration: none;
+            color: #000;
+        }
+        .schedule-controls a:hover {
+            color: #999;
+        }
+    /*
         td.slot.recess,
         td.slot.recess.colspan-1.rowspan-1,
         td.slot.recess.colspan-1.rowspan-2 {
@@ -48,39 +53,12 @@
             font-style: italic;
             font-size: 8pt;
         }
-        th {
-            font-size: 12pt;
-            background: #FFF;
-            padding: 2px 4px;
-            border: none;
-            border-right: 1px solid #666;
-        }
-        td.time {
-            width: 50px;
-            font-size: 9pt;
-            border: none;
-            border-top: 1px solid #666;
-        }
         td.colspan-1.rowspan-1 {
             background: #FFFCC9;
         }
         td.colspan-1.rowspan-2 {
             background: #FDA;
         }
-        td.slot:hover .controls {
-            display: block;
-        }
-        .controls {
-            display: none;
-            font-size: 8pt;
-        }
-        .controls a {
-            text-decoration: none;
-            color: #000;
-        }
-        .controls a:hover {
-            color: #999;
-        }
         #facebox h3 {
             margin-top: 0;
         }