diff --git a/index.php b/index.php
index 32449c9..2a9a36b 100644
--- a/index.php
+++ b/index.php
@@ -2,12 +2,15 @@
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 
 <?php if (!$comicpress_options['disable_comic_frontpage'] && !$comicpress_options['disable_comic_blog_frontpage'] && !is_paged() )  {
+	if (is_archive()) echo "Thinks its an archive";
 	Protect();
-	$comic_query = '&showposts=1&cat='.get_all_comic_categories_as_cat_string();
-	$posts = query_posts($comic_query);
+	$comic_query = 'showposts=1&cat="'.get_all_comic_categories_as_cat_string().'"';
+	query_posts($comic_query);
 	$wp_query->is_archive = false;
 	if (have_posts()) {
-		comicpress_display_post();
+		while (have_posts()) : the_post();
+			comicpress_display_post();
+		endwhile;
 	}
 	Restore(); 
 	UnProtect(); 
diff --git a/layout-foot.php b/layout-foot.php
index bd5658e..58bb8ce 100644
--- a/layout-foot.php
+++ b/layout-foot.php
@@ -1,5 +1,4 @@
 <?php if (comicpress_check_child_file('layout-foot') == false) { ?>
-	</div>
 </div>
 <?php if (is_cp_theme_layout('v3cr')) { ?>
 		</div>
diff --git a/layout-head.php b/layout-head.php
index 8d02107..f42fd64 100644
--- a/layout-head.php
+++ b/layout-head.php
@@ -17,28 +17,31 @@
 	<?php if (is_cp_theme_layout('v,v3c')) { ?>
 		<div id="content" class="narrowcolumn">
 			<?php get_sidebar('overblog'); ?>
-			<div class="column">
 	<?php } ?>
 
 <?php 
-	if (!$comicpress_options['disable_comic_frontpage'] && is_home()) {
-		Protect();
-		$comic_query = 'showposts=1&cat='.get_all_comic_categories_as_cat_string();
-		$posts = query_posts($comic_query);
-		if (have_posts()) {
-			while (have_posts()) : the_post();
-				global $frontpage_postnum;
-				$frontpage_postnum = $post->ID;
-				$wp_query->is_single = true;
-				comicpress_display_comic_area();
-			endwhile;
+	if (is_home()) {
+		if (!$comicpress_options['disable_comic_frontpage']) {
+			Protect();
+			$comic_query = 'showposts=1&cat='.get_all_comic_categories_as_cat_string();
+			query_posts($comic_query);		
+			if (have_posts()) {
+				while (have_posts()) : the_post();
+					$temp_single = $wp_query->is_single;
+					$wp_query->is_single = true;
+					comicpress_display_comic_area();
+					$wp_query->is_single = $temp_single;
+					$temp_single = null;
+				endwhile;
+			}
+			Restore();
+			UnProtect();
+			wp_reset_query();	
+		}
+	} else {
+		if (is_single() && in_comic_category()) {
+			comicpress_display_comic_area();
 		}
-		Restore();
-		UnProtect();
-		wp_reset_query();
-	}
-	if (is_single() & in_comic_category()) {
-		comicpress_display_comic_area();
 	}
 ?>
 
@@ -57,7 +60,6 @@
 	<?php if (!is_cp_theme_layout('v3c,v')) { ?>
 		<div id="content" class="narrowcolumn">
 			<?php get_sidebar('overblog'); ?>
-			<div class="column">
 	<?php } ?>
 <?php } ?>
 	
diff --git a/style.css b/style.css
index 4677aad..b388353 100644
--- a/style.css
+++ b/style.css
@@ -443,8 +443,8 @@ h4, h4 a {
 }
 
 	.narrowcolumn {
-		width: 540px;
-		padding: 5px 10px;
+		width: 550px;
+		padding: 0 5px;
 	}
 	
 	/* add 10px to smaller width layouts */
@@ -458,10 +458,6 @@ h4, h4 a {
 		overflow: hidden;
 	}
 	
-	.column {
-		overflow: hidden;
-	}
-	
 	.column_one {
 		width: 48%; 
 		float: left; 
@@ -474,18 +470,15 @@ h4, h4 a {
 		padding: 1%; 
 	}
 
-.post, .post-page {
-	clear: both;
-	text-align: left;
-	padding: 2px;
-	margin-bottom: 20px;
-}
+.post {}
 
 .post-content {
 	padding: 3px;
 }
 
-.post-foot {
+.home .post-blog .post-foot, 
+.page-template-blog-php .post-foot {
+	margin-bottom: 40px;
 }
 
 .post-image {
diff --git a/widgets/ComicBlogPostWidget.inc b/widgets/ComicBlogPostWidget.inc
index a79e3ce..d74fd77 100644
--- a/widgets/ComicBlogPostWidget.inc
+++ b/widgets/ComicBlogPostWidget.inc
@@ -33,8 +33,11 @@ class ComicPressComicBlogPostWidget extends WP_Widget {
 						$temp_query = $wp_query->is_single;
 						$wp_query->is_single = true;
 						$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
-						if ( !empty( $title ) ) { echo "<div class=\"comic-post-header\">".$title."</div>\r\n"; } 
+						if (!empty($title)) { echo "<div class=\"comic-post-widget-header\">".$title."</div>\r\n"; }
+						if ($instance['showtitle']) { echo "<div class=\"comic-post-widget-title\">".get_the_title()."</div>\r\n"; }
+						if ($instance['showdate']) { echo "<div class=\"comic-post-widget-date\">".get_the_time('F jS, Y')."</div>\r\n"; }
 						the_content();
+						if ($instance['showcommentlink']) comicpress_display_comment_link();
 						$wp_query->is_single = $temp_query;
 						echo $after_widget;
 					}
@@ -44,11 +47,14 @@ class ComicPressComicBlogPostWidget extends WP_Widget {
 			UnProtect();
 			wp_reset_query();
 		} else {
-			if (!empty($post->post_content)) {
+			if (!empty($post->post_content) && in_comic_category()) {
 				echo $before_widget;
 				$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
-				if ( !empty( $title ) ) { echo "<div class=\"comic-post-header\">".$title."</div>\r\n"; }
+				if (!empty($title)) { echo "<div class=\"comic-post-widget-header\">".$title."</div>\r\n"; }
+				if ($instance['showtitle']) { echo "<div class=\"comic-post-widget-title\">".get_the_title()."</div>\r\n"; }
+				if ($instance['showdate']) { echo "<div class=\"comic-post-widget-date\">".get_the_time('F jS, Y')."</div>\r\n"; }
 				the_content();
+				if ($instance['showcommentlink']) comicpress_display_comment_link();
 				echo $after_widget;
 			}
 		}
@@ -57,17 +63,27 @@ class ComicPressComicBlogPostWidget extends WP_Widget {
 	function update($new_instance, $old_instance) {
 		$instance = $old_instance;
 		$instance['title'] = strip_tags($new_instance['title']);
-		$instance['onlyhome'] = (bool)( $new_instance['onlyhome'] == 1 ? true : false );		
+		$instance['onlyhome'] = (bool)( $new_instance['onlyhome'] == 1 ? true : false );
+		$instance['showtitle'] = (bool)( $new_instance['showtitle'] == 1 ? true : false );		
+		$instance['showdate'] = (bool)( $new_instance['showdate'] == 1 ? true : false );
+		$instance['showcommentlink'] = (bool)( $new_instance['showcommentlink'] == 1 ? true : false );
 		return $instance;
 	}
 	
 	function form($instance) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'onlyhome' => false  ) );
+		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'onlyhome' => false, 'showtitle' => false, 'showdate' => false, 'showcommentlink' => false  ) );
 		$title = strip_tags($instance['title']);
 		$onlyhome = $instance['onlyhome'];
+		$showtitle = $instance['showtitle'];
+		$showdate = $instance['showdate'];
+		$showcommentlink = $instance['showcommentlink'];
 		?>
 		<p><label for="<?php echo $this->get_field_id('title'); ?>">Heading:<br /><input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p>
-		<p><label for="<?php echo $this->get_field_id('onlyhome'); ?>"><input id="<?php echo $this->get_field_id('onlyhome'); ?>" name="<?php echo $this->get_field_name('onlyhome'); ?>" type="checkbox" value="1" <?php checked(true, $onlyhome); ?> /> Display only on the home page?</label></p>			
+		<p><label for="<?php echo $this->get_field_id('onlyhome'); ?>"><input id="<?php echo $this->get_field_id('onlyhome'); ?>" name="<?php echo $this->get_field_name('onlyhome'); ?>" type="checkbox" value="1" <?php checked(true, $onlyhome); ?> /> Display only on the home page?</label></p>
+		<p><label for="<?php echo $this->get_field_id('showtitle'); ?>"><input id="<?php echo $this->get_field_id('showtitle'); ?>" name="<?php echo $this->get_field_name('showtitle'); ?>" type="checkbox" value="1" <?php checked(true, $showtitle); ?> /> Show the title of the post?</label></p>
+		<p><label for="<?php echo $this->get_field_id('showdate'); ?>"><input id="<?php echo $this->get_field_id('showdate'); ?>" name="<?php echo $this->get_field_name('showdate'); ?>" type="checkbox" value="1" <?php checked(true, $showdate); ?> /> Show the date of the post?</label></p>			
+		<p><label for="<?php echo $this->get_field_id('showcommentlink'); ?>"><input id="<?php echo $this->get_field_id('showcommentlink'); ?>" name="<?php echo $this->get_field_name('showcommentlink'); ?>" type="checkbox" value="1" <?php checked(true, $showcommentlink); ?> /> Show the comment link to the post?</label></p>			
+		
 		<?php
 	}
 }
diff --git a/widgets/CommentsWidget.inc b/widgets/CommentsWidget.inc
index 6f23755..c6551cf 100644
--- a/widgets/CommentsWidget.inc
+++ b/widgets/CommentsWidget.inc
@@ -24,7 +24,7 @@ class ComicPressCommentsWidget extends WP_Widget {
 		
 		echo $before_widget;
 		$title = empty($instance['title']) ? __('Permalink','comicpress') : apply_filters('widget_title', $instance['title']); ?>
-		<?php if ('open' == $post->comment_status) { ?><div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&rdquo;</span>Comment ', '<span class="comment-balloon">1</span>Comment ', '<span class="comment-balloon">%</span>Comment '); ?></div><?php } ?>
+		<?php if ('open' == $post->comment_status) { ?><div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty"> </span> Comment ', '<span class="comment-balloon">1</span> Comment ', '<span class="comment-balloon">%</span> Comment '); ?></div><?php } ?>
 		<?php
 		echo $after_widget;
 	}