diff --git a/ext/comment/style.css b/ext/comment/style.css
index 1433d932..74aa19e6 100644
--- a/ext/comment/style.css
+++ b/ext/comment/style.css
@@ -25,6 +25,13 @@
 	visibility: visible;
 }
 
+.comment_add TEXTAREA {
+	width: 100%;
+}
+.comment_add INPUT {
+	width: 100%;
+}
+
 #comment-list-list .blockbody,
 #comment-list-recent .blockbody,
 #comment-list-image .blockbody,
diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index b6a94246..217fc0bc 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -66,7 +66,7 @@ class CommentListTheme extends Themelet {
 			
 			$comment_count = count($comments);
 			if($comment_limit > 0 && $comment_count > $comment_limit) {
-				$comment_html .= '<p>showing '.$comment_limit.' of '.$comment_count.' comments</p>';
+				$comment_html .= "<p>showing $comment_limit of $comment_count comments</p>";
 				$comments = array_slice($comments, -$comment_limit);
 				$this->show_anon_id = false;
 			}
@@ -87,7 +87,8 @@ class CommentListTheme extends Themelet {
 						$comment_html .= $this->build_postbox($image->id);
 					}
 					else {
-						$comment_html .= "<a href='".make_link("post/view/".$image->id)."'>Add Comment</a>";
+						$link = make_link("post/view/".$image->id);
+						$comment_html .= "<a href='$link'>Add Comment</a>";
 					}
 				}
 			}
@@ -209,7 +210,6 @@ class CommentListTheme extends Themelet {
 		//$u_tags = url_escape(implode(" ", $search_terms));
 		//$query = empty($u_tags) ? "" : '/'.$u_tags;
 
-
 		$h_prev = ($page_number <= 1) ? "Prev" : "<a href='$prev'>Prev</a>";
 		$h_index = "<a href='".make_link("post/list")."'>Index</a>";
 		$h_next = ($page_number >= $total_pages) ? "Next" : "<a href='$next'>Next</a>";
@@ -308,7 +308,7 @@ class CommentListTheme extends Themelet {
 		$h_captcha = $config->get_bool("comment_captcha") ? captcha_get_html() : "";
 
 		return '
-		<div class="comment">
+		<div class="comment comment_add">
 			'.make_form(make_link("comment/add")).'
 				<input type="hidden" name="image_id" value="'.$i_image_id.'" />
 				<input type="hidden" name="hash" value="'.$hash.'" />