diff --git a/pinaxcon/templates/pyconau2017/content_page.html b/pinaxcon/templates/pyconau2017/content_page.html
index cf3b8fcdd9f55255e1ecd4b719a8c2ad8ea44e7b..7269944cc00fede2bd1bd22b36f92fac35e2e7df 100644
--- a/pinaxcon/templates/pyconau2017/content_page.html
+++ b/pinaxcon/templates/pyconau2017/content_page.html
@@ -13,31 +13,27 @@
 {% block head_title %}{% endblock %}
 
 {% block body %}
-  {% block heading_panel %}
-    <div class="panel panel__compact panel__bg">
 
-      <div style="background-image: url('{% block header_background_image %}{% endblock %}');" class="panel--bg"></div>
+  {% block heading_panel %}
+    <div style="background-image: url('{% block header_background_image %}{% endblock %}');" class="panel--bg"></div>
 
       <div class="panel--content">
         <div class="panel--2-3">
-          <h2>{% block header_title %}{% endblock %}</h2>
+          {% block header_title %}{% endblock %}
           <p class="lede">{% block header_paragraph %}{% endblock %}</p>
         </div>
         {% block header_inset_image_base %}
-          <div class="panel--1-3">
-            <div class="portrait">
-              <div style="background-image: url('{% block header_inset_image %}{% endblock %}');" class="portrait--img"></div>
-            </div>
-          </div>
         {% endblock %}
-      </div>
-
     </div>
+
+
+  {% block topbar_base %}
+  {% endblock %}
   {% endblock %}
 
   {% block content_base %}
     <div class="l-content-page">
-      <div class="l-content-page--richtext">
+      <div class="l-content-page">
         {% block content %}
         {% endblock %}
       </div>
@@ -48,3 +44,4 @@
 {% block extra_script %}
   <script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>
 {% endblock %}
+