diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index 146ff9a..5bfcdb6 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -152,6 +152,7 @@ foreach ( $years as $year ) {
 			</div>
 		<?php } ?>
 		</div>
+		<div class="clear"></div>
 	</div>
 	<div class="post-foot"></div>
 </div>
diff --git a/functions.php b/functions.php
index 8efddbb..5972e95 100644
--- a/functions.php
+++ b/functions.php
@@ -771,10 +771,10 @@ if ( function_exists('register_sidebar') ) {
 	) as $label) {
 		register_sidebar(array(
 			'name'=> $label,
-			'before_widget' => '<div id="%1$s" class="widget %2$s">',
-			'after_widget'  => '</div>',
-			'before_title'  => '<h2 class="widgettitle">',
-			'after_title'   => '</h2>'
+			'before_widget' => '<div id="%1$s">'."\r\n".'<div class="widget-head"><div>'."\r\n".'<div class="widget %2$s">'."\r\n",
+			'after_widget'  => '</div>'."\r\n".'<div class="widget-foot"></div>'."\r\n".'</div>'."\r\n",
+			'before_title'  => '<h2 class="widgettitle">'."\r\n",
+			'after_title'   => '</h2>'."\r\n"
 		));
 	}
 }
diff --git a/functions/displaypost.php b/functions/displaypost.php
index a30977e..d7c8e2b 100644
--- a/functions/displaypost.php
+++ b/functions/displaypost.php
@@ -69,7 +69,7 @@ function comicpress_display_post_tags() {
 
 function comicpress_display_comment_link() {
 	global $post;
-	if ('open' == $post->comment_status) {
+	if ('open' == $post->comment_status && !is_page()) {
 		if (comicpress_check_child_file('partials/commentlink') == false && !is_single()) {
 			$post_comment_link = "<div class=\"comment-link\">".get_comment_reply_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress'))."</div>\r\n";
 			apply_filters('comicpress_display_comment_link',$post_comment_link);
@@ -175,9 +175,9 @@ function comicpress_display_post() {
 					<?php comicpress_display_comment_link(); ?>
 					<div class="clear"></div>
 					<?php comicpress_display_related_posts(); ?>
+					<?php if (is_page()) { edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>'); } ?>
 				</div>
 			</div>
-			<?php if (is_page()) { edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>'); } ?>
 		<div class="post-foot"></div>
 	</div>
 	<?php
diff --git a/style.css b/style.css
index 844cdff..541cc1c 100644
--- a/style.css
+++ b/style.css
@@ -474,7 +474,7 @@ h4, h4 a {
 		padding: 1%; 
 	}
 
-.post {
+.post, .post-page {
 	clear: both;
 	text-align: left;
 	padding: 2px;