diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index 7b30b7b..de70428 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -161,6 +161,8 @@ foreach ( $years as $year ) {
 			</div>
 		<?php } ?>
 		</div>
+		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
+		<br class="clear-margins" />
 	</div>
 	<div class="post-page-foot"></div>
 </div>
diff --git a/archive-comic-year.php b/archive-comic-year.php
index 3b54152..32857ea 100644
--- a/archive-comic-year.php
+++ b/archive-comic-year.php
@@ -34,6 +34,8 @@ if (empty($archive_year) || $archive_year == '') $archive_year = date('Y');
 		<div class="entry">
 			<?php the_content(); ?>
 		</div>
+		<br class="clear-margins" />
+		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
 	<?php endwhile; ?>
 		<div class="archive-yearlist">| 
 			<?php $years = $wpdb->get_col("SELECT DISTINCT YEAR(post_date) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date ASC");
diff --git a/archive-comic.php b/archive-comic.php
index a0fa4ec..7f87573 100644
--- a/archive-comic.php
+++ b/archive-comic.php
@@ -36,7 +36,8 @@ Template Name: Comic Archive
 				<?php endwhile; ?>
 			</table>
 	<?php } } ?>
-
+		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
+		<br class="clear-margins" />
 	</div>
 	<div class="post-page-foot"></div>
 </div>
diff --git a/buystrip.php b/buystrip.php
index d37d951..9e7ffdf 100644
--- a/buystrip.php
+++ b/buystrip.php
@@ -110,8 +110,8 @@ Template Version: 2.14
 				    <?php the_content() ?>
 				    <?php wp_link_pages(array('before' => '<p><strong>'.__('Pages:','comicpress').'</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
 			    </div>
+				<br class="clear-margins" />
 			    <?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
-			    <br class="clear-margins" />
 		    </div>
 		    <div class="post-page-foot"></div>
 		</div>
diff --git a/links.php b/links.php
index bc44f8b..7218986 100644
--- a/links.php
+++ b/links.php
@@ -28,6 +28,11 @@ Template Name: Links
 			<?php if (!$comicpress_options['disable_page_titles']) { ?>
 				<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php } ?>
+			<div class="entry">
+				<?php the_content(); ?>
+			</div>
+			<br class="clear-margins" />
+			<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
 			<div id="linkspage">
 			<ul>
 				<?php echo $bookmarks; ?>