diff --git a/themes/hugo-theme-console/layouts/shortcodes/talks.html b/themes/hugo-theme-console/layouts/shortcodes/talks.html
index 1cf7218..2191a5d 100644
--- a/themes/hugo-theme-console/layouts/shortcodes/talks.html
+++ b/themes/hugo-theme-console/layouts/shortcodes/talks.html
@@ -23,16 +23,28 @@ An exploration from the chips on the PCB to how Linux makes the phone work. We'l
         <ul>
             {{ $currentLocation := . }}
             {{ range $json.talks }}
-              {{ if eq .location $currentLocation }}
-                <li>
-                    <strong>Title:</strong> {{ .title }}<br>
-                    <strong>Subtitle:</strong> {{ .subtitle }}<br>
-                    <strong>Speaker:</strong> {{ .speaker }}<br>
-                    <strong>Date:</strong> {{ .date }}<br>
-                    <strong>URL:</strong> <a href="{{ .url }}">{{ .url }}</a><br>
-                    <strong>Description:</strong> {{ .description }}<br>
-                    <br>
-                </li>              
+                {{ if eq .location $currentLocation }}
+                    <li>
+                        <strong>Title:</strong> {{ .title }}<br>
+                        {{ with .subtitle }}
+                            {{ if ne . "" }}
+                                <strong>Subtitle:</strong> {{ . }}<br>
+                            {{ end }}
+                        {{ end }}
+                        {{ if isset . "speakers" }}
+                            {{ $speakers := .speakers }}
+                            {{ if ne (len $speakers) 0 }}
+                                <strong>Speakers:</strong> 
+                                {{ range $index, $speaker := $speakers }}
+                                    {{ $speaker }}
+                                    {{ if ne $index (sub (len $speakers) 1) }}, {{ end }}
+                                {{ end }}<br>
+                            {{ end }}
+                        {{ end }}
+                        <strong>Date:</strong> {{ .date }}<br>
+                        <strong>URL:</strong> <a href="{{ .url }}">{{ .url }}</a><br>
+                        <strong>Description:</strong> {{ .description }}<br><br>
+                    </li>              
                 {{ end }}
             {{ end }}
         </ul>