diff --git a/archetypes/talk.md b/archetypes/talk.md
index ddc5ffc5..d254c2df 100644
--- a/archetypes/talk.md
+++ b/archetypes/talk.md
@@ -4,6 +4,8 @@ title = ""
 abstract = ""
 abstract_short = ""
 event = ""
+event_url = ""
+location = ""
 selected = false
 url_pdf = ""
 url_slides = ""
diff --git a/exampleSite/content/home/talks.md b/exampleSite/content/home/talks.md
index be34468d..487fdf29 100644
--- a/exampleSite/content/home/talks.md
+++ b/exampleSite/content/home/talks.md
@@ -1,11 +1,10 @@
 +++
-# Recent Talks widget.
-# Note: this widget will only display if `content/talk/` contains talks.
+# Recent and Upcoming Talks widget.
 
 date = "2016-04-20T00:00:00"
 draft = false
 
-title = "Recent Talks"
+title = "Recent & Upcoming Talks"
 subtitle = ""
 widget = "talks"
 
diff --git a/exampleSite/content/talk/example-talk.md b/exampleSite/content/talk/example-talk.md
index 8c1c7b6f..aa396dd9 100644
--- a/exampleSite/content/talk/example-talk.md
+++ b/exampleSite/content/talk/example-talk.md
@@ -1,14 +1,16 @@
 +++
-date = "2016-12-22T00:00:00"
+date = "2017-01-01T00:00:00"
 math = true
 title = "Example Talk"
 abstract = ""
 abstract_short = ""
 event = "Hugo Academic Theme Conference"
+event_url = "https://example.org"
+location = "London, United Kingdom"
 selected = false
 url_pdf = ""
 url_slides = ""
 url_video = ""
 +++
 
-More detail can easily be written here using *Markdown* and $\rm \LaTeX$ math code.
+Embed your slides or video here using [shortcodes](https://gcushen.github.io/hugo-academic-demo/post/writing-markdown-latex/). Further details can easily be added using *Markdown* and $\rm \LaTeX$ math code. 
diff --git a/i18n/en.yaml b/i18n/en.yaml
index 29b6bedd..6c3f4411 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -69,6 +69,9 @@
 - id: event
   translation: Event
 
+- id: location
+  translation: Location
+
 # Project details
 
 - id: open_project_site
diff --git a/layouts/partials/talk_li_simple.html b/layouts/partials/talk_li_simple.html
index 4d602a90..f470f6a5 100644
--- a/layouts/partials/talk_li_simple.html
+++ b/layouts/partials/talk_li_simple.html
@@ -1,12 +1,12 @@
 <li itemscope itemtype="http://schema.org/CreativeWork">
-  <i class="fa-li fa fa-file-text-o pub-icon" aria-hidden="true"></i>
-  <span itemprop="name">{{ .Title }}</span>
-  <div class="talk-event">
+  <i class="fa-li fa fa-comment-o pub-icon" aria-hidden="true"></i>
+  <span itemprop="name"><a href="{{ .Permalink }}">{{ .Title }}</a></span>
+  <p>
+    {{ .Date.Format $.Site.Params.date_format }},
     {{ if .Params.event_short }}
         {{ .Params.event_short | markdownify }}
     {{ else if .Params.event }}
             {{ .Params.event | markdownify }}
     {{ end }}
-  </div>
-  <p>{{ partial "talk_links" (dict "content" . "is_list" 1) }}</p>
+  </p>
 </li>
diff --git a/layouts/talk/single.html b/layouts/talk/single.html
index fb1e4cf3..e20a9e59 100644
--- a/layouts/talk/single.html
+++ b/layouts/talk/single.html
@@ -30,8 +30,10 @@
       <div class="col-sm-1"></div>
       <div class="col-sm-10">
         <div class="row">
-          <div class="col-xs-12 col-sm-3 pub-row-heading">{{ i18n "event" }}</div>
-          <div class="col-xs-12 col-sm-9">{{ .Params.event | markdownify }}</div>
+          <div class="col-xs-12 col-sm-3 pub-row-heading">{{ i18n "date" }}</div>
+          <div class="col-xs-12 col-sm-9" itemprop="datePublished">
+            {{ .Date.Format $.Site.Params.date_format }}
+          </div>
         </div>
       </div>
       <div class="col-sm-1"></div>
@@ -42,9 +44,11 @@
       <div class="col-sm-1"></div>
       <div class="col-sm-10">
         <div class="row">
-          <div class="col-xs-12 col-sm-3 pub-row-heading">{{ i18n "date" }}</div>
-          <div class="col-xs-12 col-sm-9" itemprop="datePublished">
-            {{ .Date.Format "January, 2006" }}
+          <div class="col-xs-12 col-sm-3 pub-row-heading">{{ i18n "event" }}</div>
+          <div class="col-xs-12 col-sm-9">
+            {{ with .Params.event_url }}<a href="{{ . }}" target="_blank">{{ end }}
+            {{ .Params.event | markdownify }}
+            {{ if .Params.event_url }}</a>{{ end }}
           </div>
         </div>
       </div>
@@ -52,6 +56,21 @@
     </div>
     <div class="visible-xs space-below"></div>
 
+    {{ with .Params.location }}
+    <div class="row">
+      <div class="col-sm-1"></div>
+      <div class="col-sm-10">
+        <div class="row">
+          <div class="col-xs-12 col-sm-3 pub-row-heading">{{ i18n "location" }}</div>
+          <div class="col-xs-12 col-sm-9">{{ . | markdownify }}</div>
+        </div>
+      </div>
+      <div class="col-sm-1"></div>
+    </div>
+    <div class="visible-xs space-below"></div>
+    {{ end }}
+
+    {{ if .Params.url_pdf | or .Params.url_slides | or .Params.url_video | or .Params.url_custom }}
     <div class="row" style="padding-top: 10px">
       <div class="col-sm-1"></div>
       <div class="col-sm-10">
@@ -59,7 +78,7 @@
           <div class="col-xs-12 col-sm-3 pub-row-heading" style="line-height:34px;">{{ i18n "links" }}</div>
           <div class="col-xs-12 col-sm-9">
 
-            {{ partial "publication_links" (dict "content" . "is_list" 0) }}
+            {{ partial "talk_links" (dict "content" . "is_list" 0) }}
 
           </div>
         </div>
@@ -67,6 +86,7 @@
       <div class="col-sm-1"></div>
     </div>
     <div class="visible-xs space-below"></div>
+    {{ end }}
 
     <div class="space-below"></div>