diff --git a/404.md b/404.md
index 3981c8c7..c5b315d8 100644
--- a/404.md
+++ b/404.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: post
 title: "Page Not Found"
 excerpt: "Page not found. Your pixels are in another canvas."
 sitemap: false
diff --git a/_layouts/post-index.html b/_layouts/archive.html
similarity index 100%
rename from _layouts/post-index.html
rename to _layouts/archive.html
diff --git a/_layouts/page.html b/_layouts/page.html
deleted file mode 100644
index d71ebe4d..00000000
--- a/_layouts/page.html
+++ /dev/null
@@ -1,23 +0,0 @@
----
-layout: default
----
-
-{% include absolute-url.liquid %}
-
-<article class="page">
-  <h1>{{ page.title }}</h1>
-  <div class="article-wrap">
-    {{ content }}
-    {% if page.share != false %}
-      <hr />
-      {% include social-share.html %}
-    {% endif %}
-  </div><!-- /.article-wrap -->
-  {% if site.owner.disqus-shortname and page.comments == true %}
-    <section id="disqus_thread"></section><!-- /#disqus_thread -->
-  {% endif %}
-</article>
-
-{% if site.owner.disqus-shortname and page.comments == true %}
-  <section id="disqus_thread"></section><!-- /#disqus_thread -->
-{% endif %}
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index 788ae685..0c795ae6 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -5,19 +5,22 @@ layout: default
 {% include absolute-url.liquid %}
 
 <article class="post">
-  <div class="headline-wrap">
+  <div class="article-wrap">
     {% if page.link %}
       <h1><a href="{{ page.link }}">{{ page.title }}</a></h1>
     {% else %}
       <h1><a href="{{ absurl }}{{ page.url }}" rel="bookmark" title="{{ page.title }}">{{ page.title }}</a></h1>
     {% endif %}
-  </div><!--/ .headline-wrap -->
-  <div class="article-wrap">
+
     {{ content }}
+
     <hr />
+    
     <footer role="contentinfo">
       {% if page.share != false %}{% include social-share.html %}{% endif %}
-      <p class="byline"><strong>{{ page.title }}</strong> was published on <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time>{% if page.modified %} and last modified on <time datetime="{{ page.modified | date: "%Y-%m-%d" }}">{{ page.modified | date: "%B %d, %Y" }}</time>{% endif %}.</p>
+      {% if page.date %}
+        <p class="byline"><strong>{{ page.title }}</strong> was published on <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time>{% if page.modified %} and last modified on <time datetime="{{ page.modified | date: "%Y-%m-%d" }}">{{ page.modified | date: "%B %d, %Y" }}</time>{% endif %}.</p>
+      {% endif %}
     </footer>
   </div><!-- /.article-wrap -->
 
@@ -26,7 +29,8 @@ layout: default
   {% endif %}
 </article>
 
-{% if site.related_posts.size > 0 %}
+{% comment %}<!-- only show related on a post page -->{% endcomment %}
+{% if page.id and site.related_posts.size > 0 %}
   <div class="related-articles">
   <h4>You might also enjoy <small class="pull-right">(<a href="{{ absurl }}/posts/">View all posts</a>)</small></h4>
     <ul>
diff --git a/_sass/page.scss b/_sass/page.scss
index b1dc5423..01814c82 100644
--- a/_sass/page.scss
+++ b/_sass/page.scss
@@ -319,22 +319,6 @@ $button-size: 1.5rem;
 		height: auto;
 		-ms-interpolation-mode: bicubic;
 	}
-	.headline-wrap {
-		position: absolute;
-		bottom: 25px;
-		@include prefix(12,1);
-		@media #{$small} {
-			left: 25%;
-			margin-left: 0;
-		}
-		@media #{$x-large} {
-			@include prefix(12,1);
-		}
-		h1, h2 {
-			color: $white;
-			@include text-shadow(0 1px 2px rgba(0,0,0,.25));
-		}
-	}
 }
 
 /* Post byline */
@@ -360,7 +344,6 @@ $button-size: 1.5rem;
 		@include prefix(12,2);
 	}
 }
-
 .author-name {
 	margin-bottom: 0;
 	@media #{$small} {
@@ -368,7 +351,6 @@ $button-size: 1.5rem;
 		margin-bottom: 10px;
 	}
 }
-
 .author-bio {
 	font-size: 80%;
 	font-style: italic;
@@ -376,12 +358,10 @@ $button-size: 1.5rem;
 		margin-bottom: 20px;
 	}
 }
-
 .author-avatar {
 	max-width: 110px;
 	@include rounded(150px);
 }
-
 .author-social {
   margin-bottom: 5px;
   @include font-rem(14);
@@ -399,12 +379,10 @@ $button-size: 1.5rem;
 		margin-right: 5px;
 	}
 }
-
 @media #{$small} {
 	display: block;
 	max-width: 125px;
 }
-
 @media #{$large} {
 	.author-name,
 	.author-avatar,
diff --git a/about/index.md b/about/index.md
index 5182e9b8..bb33af28 100644
--- a/about/index.md
+++ b/about/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: post
 title: About the Theme
 tags: [about, Jekyll, theme, responsive]
 modified: 2014-08-08T20:53:07.573882-04:00
diff --git a/posts/index.md b/posts/index.md
index 8a823719..c29023f3 100644
--- a/posts/index.md
+++ b/posts/index.md
@@ -1,5 +1,5 @@
 ---
-layout: post-index
+layout: archive
 title: All Posts
 excerpt: "A List of Posts"
 ---
\ No newline at end of file
diff --git a/theme-setup/index.md b/theme-setup/index.md
index c2e9d713..8bbb02eb 100644
--- a/theme-setup/index.md
+++ b/theme-setup/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: post
 title: Theme Setup
 modified: 2016-01-19
 excerpt: "Instructions on how to install and customize the Jekyll theme Minimal Mistakes."