diff --git a/blogthon.cgi b/blogthon.cgi
index 9ff2f02..2ff273e 100755
--- a/blogthon.cgi
+++ b/blogthon.cgi
@@ -384,9 +384,9 @@ else:
 								print '        </div>'
 								print ''
 								print '        <div class="comments">'
-								print '            <div class="comment">'
 								for line in comments_content:
 									if line.split(".", 1)[0] == "-":
+										print '            <div class="comment">'
 										print '                <div class="comment_author">' + line.split(".", 1)[1].strip() + '</div>'
 									elif line.split(".", 1)[0] == "+":
 										print '                <div class="comment_date">' + line.split(".", 1)[1].strip() + '</div>'
diff --git a/styles/blogthon_noir.css b/styles/blogthon_noir.css
index 439fbd8..ff14495 100644
--- a/styles/blogthon_noir.css
+++ b/styles/blogthon_noir.css
@@ -321,17 +321,18 @@ div.comments	{
 
 	div.comment	{
 		margin-top: 5px;
-		margin-bottom: 5px;
-		padding-top: 5px;
-		padding-bottom: 5px;
+		margin-bottom: 15px;
+		padding: 5px;
 		border-top: 2px solid #7FFF00;
 		border-bottom: 2px solid #FFFF00;
+		border-left: 1px dotted #DFDFDF;
+		border-right: 1px dotted #DFDFDF;
+		background-color: #222222;
 	}
 	
 		div.comment_author	{
 			margin-right: 5px;
 			font-weight: bold;
-			float: left;
 		}
 
 		div.comment_date	{
@@ -345,12 +346,14 @@ div.comments	{
 		}
 
 	div.submit_comment	{
+		margin-top: 5px;
+		margin-bottom: 15px;
+		padding: 5px;
 		border-top: 2px solid #7FFF00;
 		border-bottom: 2px solid #FFFF00;
-		margin-top: 5px;
-		margin-bottom: 5px;
-		padding-top: 5px;
-		padding-bottom: 5px;
+		border-left: 1px dotted #DFDFDF;
+		border-right: 1px dotted #DFDFDF;
+		background-color: #222222;
 	}
 
 		label.submit_comment_name	{