diff --git a/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html b/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html
index c5171b30..502d3113 100644
--- a/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html
+++ b/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html
@@ -11,11 +11,11 @@
 
 {% if value.panel_type == "simple" %}
 
-<div class="panel panel__bg {{ compact }}">
-  <div class="panel--content">
+    {% comment %}
     {% include "cms_pages/home_page_blocks/basic_content_text_and_links.html" %}
-  </div>
-</div>
+    {% endcomment %}
+
+    {{ value.body }}
 
 {% elif value.panel_type == "blue_left" %}
 
diff --git a/pinaxcon/templates/cms_pages/home_page_blocks/basic_content_text_and_links.html b/pinaxcon/templates/cms_pages/home_page_blocks/basic_content_text_and_links.html
index 58b689f6..e6848003 100644
--- a/pinaxcon/templates/cms_pages/home_page_blocks/basic_content_text_and_links.html
+++ b/pinaxcon/templates/cms_pages/home_page_blocks/basic_content_text_and_links.html
@@ -7,8 +7,8 @@
 {% endif %}
 
 <div class="panel--2-3">
-  <h2>{{ value.heading }}</h2>
-  <p class="lede">{{ value.body }}</p>
+  <!--h2>{{ value.heading }}</h2-->
+  <p class="lede"></p>
   <div class="btn-group">
     {% if value.panel_type == "blue_left" %}
       <a href="{{ url }}" class="btn btn__white">{{ value.link.title }}</a>
diff --git a/pinaxcon/templates/pyconau2017/content_page.html b/pinaxcon/templates/pyconau2017/content_page.html
index 7269944c..63226670 100644
--- a/pinaxcon/templates/pyconau2017/content_page.html
+++ b/pinaxcon/templates/pyconau2017/content_page.html
@@ -15,33 +15,33 @@
 {% block body %}
 
   {% block heading_panel %}
-    <div style="background-image: url('{% block header_background_image %}{% endblock %}');" class="panel--bg"></div>
+    <!-- div style="background-image: url('{% block header_background_image %}{% endblock %}');" class="panel--bg"></div -->
 
-      <div class="panel--content">
-        <div class="panel--2-3">
-          {% block header_title %}{% endblock %}
-          <p class="lede">{% block header_paragraph %}{% endblock %}</p>
-        </div>
-        {% block header_inset_image_base %}
-        {% endblock %}
+    <div class="panel--content">
+    {% comment %}
+      <div class="panel--2-3">
+        {% block header_title %}{% endblock %}
+        <p class="lede">{% block header_paragraph %}{% endblock %}</p>
+      </div>
+      {% block header_inset_image_base %}
+      {% endblock %}
+    {% comment %}
     </div>
 
 
-  {% block topbar_base %}
-  {% endblock %}
+    {% block topbar_base %}
+    {% endblock %}
   {% endblock %}
 
   {% block content_base %}
-    <div class="l-content-page">
-      <div class="l-content-page">
+    <!--div class="l-content-page"-->
         {% block content %}
         {% endblock %}
-      </div>
-    </div>
+    <!--/div-->
   {% endblock %}
 {% endblock %}
 
 {% block extra_script %}
-  <script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>
+  <!--script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script -->
 {% endblock %}
 
diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html
index 625ab652..f0b6b822 100755
--- a/pinaxcon/templates/site_base.html
+++ b/pinaxcon/templates/site_base.html
@@ -16,24 +16,23 @@
     <meta http-equiv="expires" content="0" />
     <meta http-equiv="expires" content="Tue, 01 Jan 1990 12:00:00 GMT" />
 
-
-{% block viewport %}
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-{% endblock %}
-    <title>{% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %}</title>
-{% block styles %}
-    <link rel="stylesheet" href="{% static 'pyconau2017/css/app.css' %}">
-    <link rel="stylesheet" href="{% static 'pyconau2017/css/print.css' %}" media="print">
-    <link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">
-    <link href="{% static 'pyconau2017/css/bootstrap.css' %}" rel="stylesheet">
-
-    <link rel="icon" href="{% static 'pycon2017/images/favicon.ico' %}"
-    <!--Meta tags-->
-    <meta name="theme-color" content="#0c486c">
-    {% block extra_style %}
-      <link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
+    {% block viewport %}
+      <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
     {% endblock %}
-{% endblock %}
+    <title>{% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %}</title>
+
+    {% block styles %}
+      <link href="{% static 'pyconau2017/css/bootstrap.css' %}" rel="stylesheet">
+      <link rel="stylesheet" href="{% static 'pyconau2017/css/app.css' %}">
+      <link rel="stylesheet" href="{% static 'pyconau2017/css/print.css' %}" media="print">
+      <link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">
+
+      <link rel="icon" href="{% static 'pycon2017/images/favicon.ico' %}"
+
+      <!--Meta tags-->
+      <meta name="theme-color" content="#0c486c">
+    {% endblock %}
+
     <!--Twitter-->
     <meta name="twitter:card" content="summary">
     <meta name="twitter:site" content="@pyconau2017">
@@ -48,55 +47,56 @@
     <meta property="og:type" content="website">
     <meta property="fb:admins" content="729577430">
     <meta property="fb:profile_id" content="293907417664731">
-        {% block extra_head_base %}
-            {% block extra_head %}{% endblock %}
-        {% endblock %}
+
+    {% block extra_head_base %}
+        {% block extra_head %}{% endblock %}
+    {% endblock %}
   </head>
   <body class="{% block body_class %}{% endblock %}"
       style="background-image: url({% static 'pyconau2017/images/pyconau-2016-collage.jpg' %});">
-{% block topbar_base %}
-    {#
-    {% block nav %}
-        {% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
-      <a href="#" data-menu-opener="" class="l-header--menu-opener"></a>
-    </header>
-      {% sitetree_menu from "main" include "trunk" template "sitetree_opener.html" %}
-    {% endblock %}
-    #}
-{% endblock %}
+    {% block topbar_base %}
 
-{% block body_base %}
-  <div style="height: 100px;" />
-    <main role="main">
-    {% block body %}
-      {% block content %}
+      {% block nav %}
+      {% comment %}
+        {% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
+           <a href="#" data-menu-opener="" class="l-header--menu-opener"></a>
+        {% sitetree_menu from "main" include "trunk" template "sitetree_opener.html" %}
+      {% endcomment %}
+      {% endblock %}
+
+    {% endblock %}
+
+    {% block body_base %}
+      <!--div style="height: 100px;" /-->
+        <!--main role="main"-->
+        {% block body %}
+          {% block content %}
+          {% endblock %}
+        {% endblock %}
+        <!--/main-->
+      <!--/div-->
+    {% endblock %}
+
+    {% block footer_base %}
+      <!-- https://gist.github.com/geedmo/5682742-->
+      <!-- footer class="l-footer l-footer__alt" -->
+        {% block footer %}
+        {% endblock %}
+      </footer>
+    {% endblock %}
+
+    {% block scripts %}
+      {% block extra_script %}
       {% endblock %}
     {% endblock %}
-  </div>
-{% endblock %}
 
-{% block footer_base %}
-  <!-- https://gist.github.com/geedmo/5682742-->
-  <footer class="l-footer l-footer__alt">
-    {% block footer %}
-    {% endblock %}
-  </footer>
-{% endblock %}
+    {% block extra_body_base %}
+      {% block analytics %}
+	     {% include "analytics.html" %}
+      {% endblock %}
 
-    </main>
-    {% block scripts %}
-    {% comment%}
-    <script src="{% static 'pyconau2017/js/app.js' %}"></script>
-    {% include "_scripts.html" %}
-    <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
-    {% endcomment %}
-    {% block extra_script %}{% endblock %}
+      {% block extra_body %}
+      {% endblock %}
     {% endblock %}
-{% block extra_body_base %}
-{% block analytics %}
-	{% include "analytics.html" %}
-{% endblock %}
-    {% block extra_body %}{% endblock %}
-{% endblock %}
   </body>
 </html>
diff --git a/pinaxcon/templates/site_base_wagtail.html b/pinaxcon/templates/site_base_wagtail.html
index d0ff65bf..4499797f 100644
--- a/pinaxcon/templates/site_base_wagtail.html
+++ b/pinaxcon/templates/site_base_wagtail.html
@@ -1,15 +1,18 @@
 {% extends "site_base.html" %}
 {% load staticfiles %}
 {% block extra_style %}{% endblock %}
+{% comment %}
 {% block body_base %}
-    <div style="height: 100px;" />
-    <main role="main">
     {% include "_messages.html" %}
+    {% endcomment %}
     {% block body %}
       {% block content %}
       {% endblock %}
+
     {% endblock %}
+        {% comment %}
 {% endblock %}
+{% endcomment %}
 
 {% block scripts %}