diff --git a/templates/blocks/ordered-list.html b/templates/blocks/ordered-list.html
index ccca959..a2cc30c 100644
--- a/templates/blocks/ordered-list.html
+++ b/templates/blocks/ordered-list.html
@@ -1,5 +1,3 @@
-{% load wagtailcore_tags %}
-
 <ol>
   {% for item in value %}
     <li>{{ item }}</li>
diff --git a/templates/blocks/secret.html b/templates/blocks/secret.html
index ab27714..32e907c 100644
--- a/templates/blocks/secret.html
+++ b/templates/blocks/secret.html
@@ -1,10 +1,8 @@
-{% load wagtailcore_tags %}
-
 <button class="btn btn-primary btn-block" type="button" data-toggle="collapse" data-target="#secret-block" aria-expanded="false" aria-controls="secret-block">
   Show Secret
 </button>
 <div class="collapse" id="secret-block">
   <div class="well">
-    {{ value }}
+    {{ value|richtext }}
   </div>
 </div>
diff --git a/templates/blog/blog_page.html b/templates/blog/blog_page.html
index 9afe3bd..cd79ba9 100644
--- a/templates/blog/blog_page.html
+++ b/templates/blog/blog_page.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load wagtailcore_tags wagtailimages_tags %}
+{% load wagtailcore_tags %}
 
 {% block body_class %}template-blogpage{% endblock %}
 
@@ -11,7 +11,7 @@
       <p class="text-right small">
         Published: {{ page.date|datetime }}
       </p>
-      {{ page.body|richtext }}
+      {% include_block page.body %}
     </div>
   </section>
 {% endblock %}
diff --git a/templates/pages/section_index_page.html b/templates/pages/section_index_page.html
index 8a306e4..c95bffe 100644
--- a/templates/pages/section_index_page.html
+++ b/templates/pages/section_index_page.html
@@ -5,16 +5,7 @@
 {% block body_class %}template-indexpage{% endblock %}
 
 {% block content %}
-  <section class="bg-primary">
-    <div class="container">
-      <div class="row">
-        <div class="col-lg-8 col-lg-offset-2 text-center">
-          <h1 class="section-heading">{{ page.title }}</h1>
-          <hr class="light">
-        </div>
-      </div>
-    </div>
-  </section>
+  {% include 'common/header.html' %}
   {% if page.intro %}
     <section>
       <div class="container">
diff --git a/templates/pages/simple_content_page.html b/templates/pages/simple_content_page.html
index 61fdf2c..46d7f9e 100644
--- a/templates/pages/simple_content_page.html
+++ b/templates/pages/simple_content_page.html
@@ -6,9 +6,7 @@
 
 {% block content %}
   {% include 'common/header' %}
-  <section>
-    <div class="container">
-      {{ page.body|richtext }}
-    </div>
+  <section class="container">
+    {% include_block page.body %}
   </section>
 {% endblock %}
diff --git a/templates/projects/project_page.html b/templates/projects/project_page.html
index 6572454..400800e 100644
--- a/templates/projects/project_page.html
+++ b/templates/projects/project_page.html
@@ -8,21 +8,18 @@
   {% include 'common/header.html' %}
   <section>
     <div class="container">
-      <p class="text-right small">
-        Updated: {{ page.date }}
-      </p>
       {% include_block page.body %}
     </div>
   </section>
-  <div class="container text-center">
+  <section class="text-center">
     <div class="btn-group">
       {% if page.get_download_link %}
         <a class="btn btn-primary btn-xl" href="{{ page.get_download_link }}">Download {{ page.title }}</a>
       {% endif %}
 
       {% if page.url %}
-        <a class="btn btn-github btn-xl" href="{{ page.url }}"><i class="fa fa-github fa-lg"></i> View on Github</a>
+        <a class="btn btn-github btn-xl" href="{{ page.project_url }}"><i class="fa fa-github fa-lg"></i> View Project</a>
       {% endif %}
     </div>
-  </div>
+  </section>
 {% endblock %}