diff --git a/assets/sass/components/content-types/_talk.sass b/assets/sass/components/content-types/_talk.sass
index 0f759e50..8f55543e 100644
--- a/assets/sass/components/content-types/_talk.sass
+++ b/assets/sass/components/content-types/_talk.sass
@@ -15,13 +15,17 @@
     & > tbody > tr > td
         vertical-align: middle
 
-    .date
-        width: 20%
+    .column-date,
+    .column-event
+        width: 200px
 
-    .feedback
-        width: 15%
+    .column-feedback
+        width: 125px
 
 .talk-type,
 .event-location
     display: block
     margin-top: 1px
+
+.talk-full .column-event
+    width: auto
diff --git a/source/_partials/talk/events.twig b/source/_partials/talk/events.twig
index e0b38695..8fa1e1aa 100644
--- a/source/_partials/talk/events.twig
+++ b/source/_partials/talk/events.twig
@@ -7,5 +7,5 @@
         {% set events = events|merge([event]) %}
     {% endfor %}
 
-    {% include "talks-table" with { events: events } %}
+    {% include "talks-table" with { events: events, hide_talk: true } %}
 </div>
diff --git a/source/_partials/talks-table.twig b/source/_partials/talks-table.twig
index 20e82961..ea2634a5 100644
--- a/source/_partials/talks-table.twig
+++ b/source/_partials/talks-table.twig
@@ -2,16 +2,16 @@
     <table class="talk-event-table table table-striped">
         <thead>
             <tr>
-                <th class="date">Date</th>
-                {% if show_talk %}<th>Talk</th>{% endif %}
-                <th>Event</th>
-                {% if show_feedback %}<th class="feedback">Feedback</th>{% endif %}
+                <th class="column-date">Date</th>
+                {% if not hide_talk %}<th>Talk</th>{% endif %}
+                <th class="column-event">Event</th>
+                {% if not hide_feedback %}<th class="column-feedback">Feedback</th>{% endif %}
             </tr>
         </thead>
         <tbody>
             {% for event in events %}
                 <tr>
-                    <td class="date">
+                    <td class="column-date">
                         {{ event.date|date('j F Y') }}
 
                         {% if event.time %}
@@ -21,7 +21,7 @@
                         {% endif %}
                     </td>
 
-                    {% if show_talk %}
+                    {% if not hide_talk %}
                         <td>
                             <a href="{{ event.talk.url }}">
                                 {{ event.talk.title }}
@@ -35,7 +35,7 @@
                         </td>
                     {% endif %}
 
-                    <td>
+                    <td class="column-event">
                         {% if event.url %}<a href="{{ event.url }}">{% endif %}
                         {{ event.title }}
                         {% if event.url %}</a>{% endif %}
@@ -47,8 +47,8 @@
                         {% endif %}
                     </td>
 
-                    {% if show_feedback -%}
-                        <td class="feedback">
+                    {% if not hide_feedback -%}
+                        <td class="column-feedback">
                             {% if event.talk.joindin %}
                                 <a href="{{ event.talk.joindin }}" class="btn btn-primary" title="Read or leave feedback for this talk">
                                     <i class="fa fa-comment-o"></i> joind.in
diff --git a/source/talks.twig b/source/talks.twig
index d6e268f3..1cb20b2b 100644
--- a/source/talks.twig
+++ b/source/talks.twig
@@ -30,15 +30,13 @@ use: [talks, posts]
 
 {% include "talks-table" with {
     events: upcoming_events|sortbyfield('date'),
-    show_talk: true
+    hide_feedback: true,
 } %}
 
 <h2>Last 5 Talks</h2>
 
 {% include "talks-table" with {
-    events: past_events|sortbyfield('date')|reverse[:5],
-    show_feedback: true,
-    show_talk: true
+    events: past_events|sortbyfield('date')|reverse[:5]
 } %}
 
 <p>You can view more talks in the <a href="/talks/archive">talks archive</a>.</p>