diff --git a/index.php b/index.php
index 8368af5..d42331a 100644
--- a/index.php
+++ b/index.php
@@ -13,27 +13,26 @@
 
 <?php if (!(is_paged())) { ?>
 
-<?php if ($disable_comic_frontpage != 'yes') { ?>
+	<?php if ($disable_comic_frontpage != 'yes') { ?>
 
-	<?php $wp_query ->in_the_loop = true; $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
-	while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post() ?>		
+		<?php $wp_query ->in_the_loop = true; $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
+		while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post() ?>		
 
-		<div id="comic-head"><?php get_sidebar('over'); ?></div>
-		<div id="comic">
-			<div class="comic-left"><?php get_sidebar('comicleft'); ?></div>
-			<div class="comic-content">
+			<div id="comic-head"><?php get_sidebar('over'); ?></div>
+			<?php get_sidebar('comicleft'); ?>
+			<div id="comic">
 				<?php display_comic(); ?>
 			</div>
-			<div class="comic-right"><?php get_sidebar('comicright'); ?></div>
+			<?php get_sidebar('comicright'); ?>
 			<div class="clear"></div>
-		</div>
-		<div id="comic-foot"><?php get_sidebar('under'); ?></div>
-	<?php endwhile; ?>
-	
-<?php } ?>
+			<div id="comic-foot"><?php get_sidebar('under'); ?></div>
+			
+		<?php endwhile; ?>
+		
+	<?php } ?>
 
 	<?php if (is_cp_theme_style('3c,standard')) { ?>
-	<div id="content-wrapper">
+		<div id="content-wrapper">
 	<?php } ?>
 	<?php get_sidebar('overblog'); ?>
 	<?php if (is_cp_theme_style('3c')) get_sidebar('left'); ?>
@@ -53,16 +52,8 @@
 		<div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
 
 	<?php } 
-		if (function_exists('the_project_wonderful_ad')) { ?>
-			<div class="blogpwad">
-				<center>
-				<?php the_project_wonderful_ad('blog'); ?>
-				</center>
-			</div>
-		<?php } ?>
-		
-		<?php get_sidebar('blog'); ?>
-<?php } else { ?>
+	
+} else { ?>
 
 	<?php if (is_cp_theme_style('3c,standard')) { ?>
 	<div id="content-wrapper">
@@ -76,6 +67,16 @@
 	<?php } 
 } 
 
+	if (function_exists('the_project_wonderful_ad')) { ?>
+		<div class="blogpwad">
+			<center>
+			<?php the_project_wonderful_ad('blog'); ?>
+			</center>
+		</div>
+	<?php }
+	
+	get_sidebar('blog');
+
 if ($disable_blog_frontpage != 'yes') { 
 	if (have_posts()) {
 		global $blog_postcount;
diff --git a/single.php b/single.php
index 0e53138..9606e41 100644
--- a/single.php
+++ b/single.php
@@ -12,16 +12,16 @@
 <?php } ?>
 
 	<?php while (have_posts()) : the_post(); if (in_comic_category()) { ?>
+	
 		<div id="comic-head"><?php get_sidebar('over'); ?></div>
+		<?php get_sidebar('comicleft'); ?>
 		<div id="comic">
-			<div class="comic-left"><?php get_sidebar('comicleft'); ?></div>
-			<div class="comic-content">
-				<?php display_comic(); ?>
-			</div>
-			<div class="comic-right"><?php get_sidebar('comicright'); ?></div>
-			<div class="clear"></div>
+			<?php display_comic(); ?>
 		</div>
-		<div id="comic-foot"><?php get_sidebar('under'); ?></div>	
+		<?php get_sidebar('comicright'); ?>
+		<div class="clear"></div>
+		<div id="comic-foot"><?php get_sidebar('under'); ?></div>
+		
 	<?php } endwhile; ?>
 
 	<?php if (is_cp_theme_style('3c,standard')) { ?>
diff --git a/style.css b/style.css
index 5749264..da5ba62 100644
--- a/style.css
+++ b/style.css
@@ -368,27 +368,25 @@ h3, h3 a {
 
 /* THE COMIC */
 
+#comic-head {
+	padding-top: 5px;
+}
+
 #comic {
 	background: #fff;
-	padding: 10px 0;
 	border: 1px solid #999;
 	text-align: center;
 	z-index: 100;
-	margin: 10px 0;
 }
 
-	#comic .comic-left {
-		float: left;
-	}
-	
-	#comic .comic-right {
-		float: right;
-	}
+#comic img {
+	margin: 5px;
+}
 
+#comic-foot {
+	padding-bottom: 5px;
+}
 
-	#comic .comic-content {
-		z-index: 100;
-	}
 
 /* THE FOOTER */
 
@@ -478,11 +476,10 @@ a.navi-comments:hover span {
 	margin: 0;
 }
 
-
+/* Wraps the content area */
 #content-wrapper {
-	margin: 0 auto;
+	margin: 0;
 	padding: 0;
-	clear: both;
 }
 
 
@@ -1342,7 +1339,8 @@ li.storyline-root {
 	padding: 5px 0 5px 5px;
 	margin: 0 8px 8px 0;
 	float: left;
-	border: 1px solid #000;
+	border: 1px solid #999;
+	background:#fff;
 }
 
 .cpcal-monthtitle {
@@ -1377,7 +1375,7 @@ li.storyline-root {
 	text-align: center;
 	font-size: 10px;
 	line-height: 13px;
-	border: 1px solid #000;
+	border: 1px solid #999;
 }
 
 .cpcal-day a {