diff --git a/blogthon.cgi b/blogthon.cgi
index 0e1f64d..a70811a 100755
--- a/blogthon.cgi
+++ b/blogthon.cgi
@@ -303,7 +303,6 @@ else:
 		print '                <div class="entry_border_right"></div>'
 		print '                <div class="entry_border_top"></div>'
 		print '                <div class="entry_border_bottom"></div>'
-		print '            </div>'
 		content.close()
 	# Entry
 	else:
@@ -333,7 +332,6 @@ else:
 						print '                <div class="entry_border_right"></div>'
 						print '                <div class="entry_border_top"></div>'
 						print '                <div class="entry_border_bottom"></div>'
-						print '            </div>'
 
 						# Comments...
 						# ... are shown when post_display and comments_file isn't false
@@ -342,7 +340,7 @@ else:
 							if comments_file:
 								comments_file = glob.glob(entries_dir + title + '.comments')
 								comments_content = open(comments_file[0], "r")
-								print ''
+								print '            </div>'
 								print '        </div>'
 								print ''
 								print '        <div class="comments">'
@@ -358,6 +356,9 @@ else:
 										print '            </div>'
 										print ''
 								comments_content.close()
+							else:
+									print '            </div>'
+									print ''
 
 							# Form for adding comments
 							random_int_a = random.randint(1,9)
@@ -371,7 +372,6 @@ else:
 							print '                <br /><label for="cquiz">' + str(random_int_a) + '+' + str(random_int_b) + '=</label><input type="text" id="cquiz" name="cquiz" />'
 							print '                <br /><input type="submit" id="submit" value="post comment" />'
 							print '             </form>'
-							print ''
 
 						if comments == "True":
 							comments_file = glob.glob(entries_dir + title + '.comments')