diff --git a/content/events/2016-chicago/welcome.md b/content/events/2016-chicago/welcome.md
index 519dca70cdb..698dc640526 100644
--- a/content/events/2016-chicago/welcome.md
+++ b/content/events/2016-chicago/welcome.md
@@ -10,18 +10,18 @@ aliases = ["/events/2016-chicago"]
 
 +++
 
-## Tuesday, August 30 and Wednesday, August 31
+## {{< event_start >}} - {{< event_end >}}
 
 Welcome!  The group that brought you DevOpsDays Chicago 2015 is back together and planning the 2016 event.  We're encouraged by the feedback from last year's event and are determined to bring an improved experience and continue the DevOps conversation this August in Chicago.
 
 <div style="text-align:center;">
-  <img alt="DevOpsDays Chicago 2016" src="./logo.png"/>
+  {{< event_logo >}}
 </div>
 
 <table>
   <tr>
     <td><b>Date</b></td>
-    <td><%= render(:partial => "/#{@eventhome}/_target_date") -%></td>
+    <td>{{< event_start >}} - {{< event_end >}}
   </tr>
   <tr>
     <td><b>Location</b></td>
@@ -38,16 +38,16 @@ Welcome!  The group that brought you DevOpsDays Chicago 2015 is back together an
 -->
   <tr>
     <td><b>Sponsors</b></td>
-    <td><a href="/sponsor/">Sponsor the event!</a> It's a great way to attract new talent and promote your organization.</td>
+    <td><a href="sponsor/">Sponsor the event!</a> It's a great way to attract new talent and promote your organization.</td>
   </tr>
   <tr>
     <td><b>Contact</b></td>
-    <td><a href="/contact/">Get in touch with the Organizers</a>.</td>
+    <td><a href="contact/">Get in touch with the Organizers</a>.</td>
   </tr>
   <tr>
     <td></td>
-    <td><a href="https://twitter.com/devopsdaysChi" class="twitter-follow-button" data-show-count="false">Follow @devopsdaysChi</a>
-    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <td>
+    {{< event_twitter devopsdayschi >}}
     </td>
   </tr>
 </table>
diff --git a/layouts/shortcodes/event_end.html b/layouts/shortcodes/event_end.html
new file mode 100644
index 00000000000..e9827408d2e
--- /dev/null
+++ b/layouts/shortcodes/event_end.html
@@ -0,0 +1,4 @@
+{{ $event := .Page.Params.event}}
+{{ $e :=  (index $.Page.Site.Data.events $event) }}
+{{ $enddate := $e.enddate}}
+{{ dateFormat "Monday, Jan 2, 2006" $enddate }}
diff --git a/layouts/shortcodes/event_link.html b/layouts/shortcodes/event_link.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/layouts/shortcodes/event_logo.html b/layouts/shortcodes/event_logo.html
new file mode 100644
index 00000000000..7e0133963af
--- /dev/null
+++ b/layouts/shortcodes/event_logo.html
@@ -0,0 +1,6 @@
+{{ $event := .Page.Params.event}}
+{{ $e :=  (index $.Page.Site.Data.events $event) }}
+{{ $city := $e.city}}
+
+{{ $cityyear := $e.year }}
+<img alt="DevOpsDays {{ $city }} {{ $cityyear }}" src="/img/events/{{ $cityyear }}-{{lower $city }}/logo.png"/>
diff --git a/layouts/shortcodes/event_start.html b/layouts/shortcodes/event_start.html
new file mode 100644
index 00000000000..1eec9b9aa36
--- /dev/null
+++ b/layouts/shortcodes/event_start.html
@@ -0,0 +1,4 @@
+{{ $event := .Page.Params.event}}
+{{ $e :=  (index $.Page.Site.Data.events $event) }}
+{{ $startdate := $e.startdate}}
+{{ dateFormat "Monday, Jan 2, 2006" $startdate }}
diff --git a/layouts/shortcodes/event_twitter.html b/layouts/shortcodes/event_twitter.html
new file mode 100644
index 00000000000..36e68d03a33
--- /dev/null
+++ b/layouts/shortcodes/event_twitter.html
@@ -0,0 +1,2 @@
+<a href="https://twitter.com/{{ index .Params 0 }}" class="twitter-follow-button" data-show-count="false">Follow @{{ index .Params 0 }}</a>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
diff --git a/static/img/events/2016-chicago/logo.png b/static/img/events/2016-chicago/logo.png
new file mode 100644
index 00000000000..08da46f07ce
Binary files /dev/null and b/static/img/events/2016-chicago/logo.png differ
diff --git a/static/img/sponsors/arresteddevops.png b/static/img/sponsors/arresteddevops.png
new file mode 100644
index 00000000000..8c1a905df81
Binary files /dev/null and b/static/img/sponsors/arresteddevops.png differ