diff --git a/ext/comment/style.css b/ext/comment/style.css
index f5014780..14a148ec 100644
--- a/ext/comment/style.css
+++ b/ext/comment/style.css
@@ -1,10 +1,4 @@
 
-#comments P {
-	text-align: left;
-	width: 150px;
-	max-width: 150px;
-	overflow: hidden;
-}
 .comment {
 	text-align: left;
 	position: relative;
@@ -26,3 +20,11 @@
 .comment:hover .info {
 	visibility: visible;
 }
+
+#comment-list .blockbody {
+	background: none;
+	border: none;
+	box-shadow: none;
+	margin: 0px;
+	padding: 0px;
+}
diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index 7d35fbc6..c2ec7d2d 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -96,7 +96,7 @@ class CommentListTheme extends Themelet {
 				</tr></table>
 			';
 
-			$page->add_block(new Block( $image->id.': '.$image->get_tag_list(), $html, "main", $position++));
+			$page->add_block(new Block( $image->id.': '.$image->get_tag_list(), $html, "main", $position++, "comment-list"));
 		}
 	}
 
@@ -111,10 +111,10 @@ class CommentListTheme extends Themelet {
 		$this->show_anon_id = false;
 		$html = "";
 		foreach($comments as $comment) {
-			$html .= $this->comment_to_html($comment, true)."<hr>";
+			$html .= $this->comment_to_html($comment, true);
 		}
 		$html .= "<a class='more' href='".make_link("comment/list")."'>Full List</a>";
-		$page->add_block(new Block("Comments", $html, "left"));
+		$page->add_block(new Block("Comments", $html, "left", 50, "comment-list"));
 	}
 
 
@@ -126,12 +126,12 @@ class CommentListTheme extends Themelet {
 		$this->show_anon_id = true;
 		$html = "";
 		foreach($comments as $comment) {
-			$html .= $this->comment_to_html($comment)."<hr>";
+			$html .= $this->comment_to_html($comment);
 		}
 		if($postbox) {
 			$html .= $this->build_postbox($image->id);
 		}
-		$page->add_block(new Block("Comments", $html, "main", 30));
+		$page->add_block(new Block("Comments", $html, "main", 30, "comment-list"));
 	}
 
 
@@ -229,6 +229,7 @@ class CommentListTheme extends Themelet {
 		$h_captcha = $config->get_bool("comment_captcha") ? captcha_get_html() : "";
 
 		return '
+		<div class="comment">
 			'.make_form(make_link("comment/add")).'
 				<input type="hidden" name="image_id" value="'.$i_image_id.'" />
 				<input type="hidden" name="hash" value="'.$hash.'" />
@@ -236,6 +237,7 @@ class CommentListTheme extends Themelet {
 				'.$h_captcha.'
 				<br><input type="submit" value="Post Comment" />
 			</form>
+		</div>
 		';
 	}
 }
diff --git a/ext/index/style.css b/ext/index/style.css
index 024c0da5..7c9e1586 100644
--- a/ext/index/style.css
+++ b/ext/index/style.css
@@ -3,4 +3,6 @@
 	background: none;
 	border: none;
 	box-shadow: none;
+	margin: 0px;
+	padding: 0px;
 }
diff --git a/themes/default/style.css b/themes/default/style.css
index b5381b94..04cf78ac 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -25,11 +25,11 @@ SECTION>H3 {
 	background: #CCC;
 	border: 1px solid #BBB;
 }
-SECTION>.blockbody {
+SECTION>.blockbody, .comment {
 	background: #DDD;
 	border: 1px solid #CCC;
 }
-SECTION>.blockbody, H1, SECTION>H3, FOOTER{
+SECTION>.blockbody, H1, SECTION>H3, FOOTER, .comment {
 	margin: 8px;
 	padding: 8px;
 	border-radius: 12px; /* standard, webkit, opera */