diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index 130f416..9723180 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -86,8 +86,6 @@ $month['12'] = array('month' => __('December','comicpress'), 'days' => '31');
 		<div class="entry">
 			<?php the_content(); ?>
 		</div>
-		<br class="clear-margins" />
-		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
 	</div>
 	<div class="post-page-foot"></div>
 </div>
@@ -172,7 +170,8 @@ foreach ( $years as $year ) {
 			</div>
 		<?php } ?>
 		</div>
-		<br class="clear-margins" />
+		<div class="clear"></div>
+		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
 	</div>
 	<div class="post-page-foot"></div>
 </div>
diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php
index 0f0c404..0e94b96 100644
--- a/functions/displayblogpost.php
+++ b/functions/displayblogpost.php
@@ -62,7 +62,7 @@ function display_blog_post() {
 			<?php
 				if ('open' == $post->comment_status) {
 					if (comicpress_check_child_file('partials/commentlink') == false && !(is_single())) { ?>
-						<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
+						<div class="comment-link"><?php comments_popup_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>
 					<?php }
 				}
 			?>
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index 110dc2c..7f44e8d 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -65,7 +65,7 @@ function display_comic_post() {
 				<?php
 					if ('open' == $post->comment_status && !$comicpress_options['static_blog'] && !(is_single())) {
 						if (comicpress_check_child_file('partials/commentlink') == false) { ?>
-							<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
+							<div class="comment-link"><?php comments_popup_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>
 						<?php }
 					}
 				?>
diff --git a/options/generaloptions.php b/options/generaloptions.php
index c84e954..3e33812 100644
--- a/options/generaloptions.php
+++ b/options/generaloptions.php
@@ -117,7 +117,7 @@
 					</tr>
 				</thead>
 				<tr class="alternate">
-					<th scope="row"><label for="enable_widgetarea_use_sidebar_css"><?php _e('Enable main Sidebar CSS for all sidebars?','comicpress'); ?></label></th>
+					<th scope="row"><label for="enable_widgetarea_use_sidebar_css"><?php _e('Enable main Sidebar CSS for all sidebars','comicpress'); ?></label></th>
 					<td>
 						<input id="enable_widgetarea_use_sidebar_css" name="enable_widgetarea_use_sidebar_css" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_widgetarea_use_sidebar_css']); ?> />
 					</td>