diff --git a/functions.php b/functions.php
index 0a43b62..34d02c4 100644
--- a/functions.php
+++ b/functions.php
@@ -50,7 +50,7 @@ function __comicpress_init() {
   }
 }
 
-function comicpress_get_header() {
+function comicpress_init() {
   global $post, $comicpress;
   
   if (!empty($post)) {
@@ -70,7 +70,9 @@ function comicpress_get_header() {
   }
   
   $comicpress->partial_paths[] = get_template_directory() . '/partials';
+}
 
+function comicpress_get_header() {
   get_header();
 }
 
diff --git a/index.php b/index.php
index cd80557..d160d54 100644
--- a/index.php
+++ b/index.php
@@ -1,26 +1,28 @@
 <?php
   global $comicpress;
 
-  comicpress_get_header();
+  comicpress_init();
 
   $nav_comics = $comicpress->get_nav_comics();
   $post = $nav_comics['last'];  
-?>
 
-<?php if (!is_paged()) { include_partial('index-display-comic'); } ?>
-	
-<div id="content" class="narrowcolumn">
-  <?php if (!is_paged() && ($comicpress->comicpress_options['comic_space'] == "comic_only")) { include_partial('index-comic-post'); } ?>
+  ob_start();
+  
+  if (!is_paged()) { include_partial('index-display-comic'); }
 
-  <?php include_partial('index-blog-header'); ?>
+  $comic = ob_get_clean();
 
-  <?php 
-    foreach ($comicpress->get_index_blog_posts() as $post) {
-      include_partial('index-blog-post');
-    }
-  ?>
-</div>
+  ob_start();
 
-<?php get_sidebar() ?>
+  if (!is_paged() && ($comicpress->comicpress_options['comic_space'] == "comic_only")) { include_partial('index-comic-post'); }
 
-<?php get_footer() ?>
\ No newline at end of file
+  include_partial('index-blog-header');
+
+  foreach ($comicpress->get_index_blog_posts() as $post) {
+    include_partial('index-blog-post');
+  }
+
+  $content = ob_get_clean();
+
+  include(get_template_directory() . '/layouts/classic.php');
+?>
\ No newline at end of file