diff --git a/data/events/2016-chicago.yml b/data/events/2016-chicago.yml
index edb93ba53fe..f36d2d382e2 100644
--- a/data/events/2016-chicago.yml
+++ b/data/events/2016-chicago.yml
@@ -10,7 +10,17 @@ cfp_date_end: 2016-06-01
 cfp_date_announce: 2016-07-01
 coordinates: "41.882219, -87.640530"
 location: "Summit West"
-navigationelements: ["welcome", "contact", "location", "program", "propose", "proposals", "conduct", "sponsor"]
+newnav: "yes"
+# navigationelements: ["welcome", "contact", "location", "program", "propose", "proposals", "conduct", "sponsor"]
+nav_elements:
+  - name: welcome
+  - name: contact
+  - name: location
+  - name: program
+  - name: propose
+  - name: conduct
+  - name: sponsor
+
 team: ["Jerry Cattell", "Brian Devlin", "Michael Lanyon", "Aaron Lindstrom", "Chris Read", "Kevin Reedy", "Sasha Rosenbaum", "Matt Stratton"]
 organizer_email: "organizers-chicago-2016@devopsdays.org"
 proposal_email: "proposals-chicago-2016@devopsdays.org"
diff --git a/themes/devopsdays-legacy/layouts/event/single.html b/themes/devopsdays-legacy/layouts/event/single.html
index 1c4158924c0..79d3dbc0831 100644
--- a/themes/devopsdays-legacy/layouts/event/single.html
+++ b/themes/devopsdays-legacy/layouts/event/single.html
@@ -18,11 +18,22 @@ <h1> {{ $e.city }} {{ $e.year }} - {{ title .Title }} </h1>
       <!-- Main navigation -->
       <div class="submenu">
         <h3>
-        {{ range $navigation := $e.navigationelements}}
-          <a href="/events/{{ $event_slug }}/{{ $navigation}}">{{ $navigation }}</a>&nbsp;
+        {{ if $e.nav_elements }}
+          {{ range $e.nav_elements }}
+            {{ if .url }}
+              <a href="{{ .url}}">{{ .name }}</a>&nbsp;
+            {{ else }}
+              <a href="/events/{{ $event_slug }}/{{ .name }}">{{ .name }}</a>&nbsp;
+            {{ end }}
+          {{ end }}
+        {{ else }}
+          {{ range $navigation := $e.navigationelements}}
+            <a href="/events/{{ $event_slug }}/{{ $navigation}}">{{ $navigation }}</a>&nbsp;
+          {{ end }}
         {{ end }}
         </h3>
       </div>
+      <!-- end main navigation -->
 
       {{ .Content }}
     </div>
diff --git a/yyyy-city.yml b/yyyy-city.yml
index c72fd36d2e6..b3fc5d49c9e 100644
--- a/yyyy-city.yml
+++ b/yyyy-city.yml
@@ -10,7 +10,16 @@ cfp_date_end: 2016-06-01
 cfp_date_announce: 2016-07-01
 coordinates: "41.882219, -87.640530" # The corrodinates of your venue. Get Latitude and Longitude of a Point: http://itouchmap.com/latlong.html
 location: "location" # The name of your location
-navigationelements: ["welcome", "contact", "location", "program", "propose", "proposals", "registration", "conduct", "sponsor"] # List of pages you want to show up in the navigation of your page. Remove any that aren't relevent yet.
+ "sponsor"] # List of pages you want to show up in the navigation of your page. Remove any that aren't relevent yet.
+nav_elements: # List of pages you want to show up in the navigation of your page. Remove any that aren't relevent yet.
+  - name: welcome
+  - name: contact
+  - name: location
+  - name: program
+  - name: propose
+    url: http://mycfp.com # The url setting is optional, and only if you want the navigation to link off-site
+  - name: conduct
+  - name: sponsor
 team: ["John Doe", "Jane Smith", "Sally Fields"]
 organizer_email: "organizers-city-year@devopsdays.org" # Put your organizer email address here
 proposal_email: "proposals-city-year@devopsdays.org" # Put your proposal email address here