diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php
index b175af8..c44fb0d 100644
--- a/functions/displayblogpost.php
+++ b/functions/displayblogpost.php
@@ -19,7 +19,7 @@ function display_blog_post() {
 	<div class="clear"></div>
 	<div class="<?php comicpress_post_class(); ?>">
 		<div class="post-head"></div>
-			<div <?php post_class(); ?> id="post-<?php the_ID() ?>">
+			<div class="post" id="post-<?php the_ID() ?>">
 				<div class="post-info">
 				<?php if ($enable_post_author_gravatar == 'yes') { ?>
 					<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index 6b2ced5..45128e1 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -10,7 +10,7 @@ function display_comic_post() {
 		global $post, $wp_query, $authordata, $enable_related_comics, $enable_comic_post_author_gravatar, $enable_comic_post_calendar, $disable_categories_in_posts, $disable_tags_in_posts;  ?>
 		<div class="<?php comicpress_post_class(); ?>">
 			<div class="post-comic-head"></div>
-				<div <?php post_class(); ?> id="post-comic-<?php the_ID() ?>">
+				<div class="post-comic" id="post-comic-<?php the_ID() ?>">
 					<div class="post-comic-info">
 					<?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
 						<div class="post-comic-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),comicpress_get_avatar(get_the_author_meta('email'), 64)); ?></div>
diff --git a/widgets/graphical-navigation-orig.php b/widgets/graphical-navigation-orig.php
index 04d6f6d..94309bb 100644
--- a/widgets/graphical-navigation-orig.php
+++ b/widgets/graphical-navigation-orig.php
@@ -81,7 +81,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 			<?php } 	
 			if ($instance['next'] == 'on') {
 				if (!empty($next_comic)) {
-					if (($next_comic == $latest_comic) && $instance['nextgohome'] == 'on') { ?>
+					if (($next_comic == $latest_comic) && $instance['lastgohome'] == 'on') { ?>
 						<a href="/" class="navi navi-next" title="<?php echo $instance['next_title']; ?>"><?php echo $instance['next_title']; ?></a>
 					<?php } else { ?>
 						<a href="<?php echo $next_comic; ?>" class="navi navi-next" title="<?php echo $instance['next_title']; ?>"><?php echo $instance['next_title']; ?></a>					
@@ -99,7 +99,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 			}
 			if ($instance['last'] == 'on') {
 				if (!empty($last_comic) && ($last_comic != $this_permalink)) {
-					if ($instance['nextgohome'] == 'on') { ?>
+					if ($instance['lastgohome'] == 'on') { ?>
 						<a href="/" class="navi navi-last" title="<?php echo $instance['last_title']; ?>"><?php echo $instance['last_title']; ?></a>
 					<?php } else { ?>
 						<a href="<?php echo $last_comic; ?>" class="navi navi-last" title="<?php echo $instance['last_title']; ?>"><?php echo $instance['last_title']; ?></a>						
@@ -130,7 +130,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		$instance['archive_path'] = strip_tags($new_instance['archive_path']);
 		$instance['buyprint'] = $new_instance['buyprint'];
 		$instance['comictitle'] = $new_instance['comictitle'];
-		$instance['nextgohome'] = $new_instance['nextgohome'];
+		$instance['lastgohome'] = $new_instance['lastgohome'];
 		
 		$instance['first_title'] = strip_tags($new_instance['first_title']);
 		$instance['last_title'] = strip_tags($new_instance['last_title']);
@@ -169,7 +169,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 					'next_title' => 'Next', 
 					'buyprint_title' => 'Buy Print',
 					'comictitle' => 'off',
-					'nextgohome' => 'off',
+					'lastgohome' => 'off',
 		 ) );
 		$first = $instance['first']; if (empty($first)) $first = 'on';
 		$last = $instance['last']; if (empty($last)) $last = 'on';
@@ -183,7 +183,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		$next = $instance['next']; if (empty($next)) $next = 'on';
 		$buyprint = $instance['buyprint']; if (empty($buyprint)) $buyprint = 'off';
 		$comictitle = $instance['comictitle']; if (empty($comictitle)) $comictitle = 'off';
-		$nextgohome = $instance['nextgohome']; if (empty($nextgohome)) $nextgohome = 'off';
+		$lastgohome = $instance['lastgohome']; if (empty($lastgohome)) $lastgohome = 'off';
 		
 				
 		$first_title = $instance['first_title']; 
@@ -268,7 +268,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		<input class="widefat" id="<?php echo $this->get_field_id('buyprint_title'); ?>" name="<?php echo $this->get_field_name('buyprint_title'); ?>" type="text" value="<?php echo attribute_escape($buyprint_title); ?>" /></label><br />
 		<hr>
 			<?php _e('Next to Last, and latest Button goes home?','comicpress'); ?><br />
-			<input id="<?php echo $this->get_field_id('nextgohome'); ?>" name="<?php echo $this->get_field_name('nextgohome'); ?>" type="radio" value="on"<?php if ( $nextgohome == "on") { echo " checked"; } ?> />On</label>&nbsp;<input id="<?php echo $this->get_field_id('nextgohome'); ?>" name="<?php echo $this->get_field_name('nextgohome'); ?>" type="radio" value="off"<?php if ( $nextgohome == "off") { echo " checked"; } ?> />Off</label><br />
+			<input id="<?php echo $this->get_field_id('lastgohome'); ?>" name="<?php echo $this->get_field_name('lastgohome'); ?>" type="radio" value="on"<?php if ( $lastgohome == "on") { echo " checked"; } ?> />On</label>&nbsp;<input id="<?php echo $this->get_field_id('lastgohome'); ?>" name="<?php echo $this->get_field_name('lastgohome'); ?>" type="radio" value="off"<?php if ( $lastgohome == "off") { echo " checked"; } ?> />Off</label><br />
 
 		<?php
 	}
diff --git a/widgets/graphical-navigation.php b/widgets/graphical-navigation.php
index f2d361b..b62c47e 100644
--- a/widgets/graphical-navigation.php
+++ b/widgets/graphical-navigation.php
@@ -91,7 +91,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
         if (isset($css_name_mapping[$which])) { $navi_class_names[] = "navi-{$css_name_mapping[$which]}"; }
         
 				$link = get_permalink($target->ID);
-				if (($which == 'next') && ($instance['nextgohome'] == 'on')) { $link = get_bloginfo('url'); }
+				if (($which == 'last') && ($instance['lastgohome'] == 'on')) { $link = get_bloginfo('url'); }
 				if ($ok) {
 				  ?><a href="<?php echo $link; ?>"
 					  	 class="navi <?php echo implode(" ", $navi_class_names); ?>"
@@ -280,7 +280,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
     $all_fields = array(
 		  'first', 'story_prev', 'story_next', 'story_prev_in',
 		  'story_next_in', 'previous', 'random', 'archives', 
-			'comments', 'next', 'last', 'buyprint', 'comictitle', 'nextgohome',
+			'comments', 'next', 'last', 'buyprint', 'comictitle', 'lastgohome',
 			'story_prev_acts_as_prev_in'
 		);
 
@@ -312,7 +312,7 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
 			'archive_path' => '',
 			'buyprint' => 'off',
 			'comictitle' => 'off',
-			'nextgohome' => 'off',
+			'lastgohome' => 'off',
 			'story_prev_acts_as_prev_in' => 'on'
 		);
 
@@ -379,12 +379,12 @@ class WidgetComicPressGraphicalStorylineNavigation extends WP_Widget {
 												 value="<?php echo attribute_escape($instance['archive_path']); ?>" />
 								</div>
 							<?php break;
-							case "next": ?>
+							case "last": ?>
 								<div>
 									<label>
-									  <input id="<?php echo $this->get_field_id('nextgohome'); ?>"
-													 name="<?php echo $this->get_field_name('nextgohome'); ?>"
-													 type="checkbox" class="comicpress-field" value="yes"<?php if ($instance['nextgohome'] == "on") { echo ' checked="checked"'; } ?> />
+									  <input id="<?php echo $this->get_field_id('lastgohome'); ?>"
+													 name="<?php echo $this->get_field_name('lastgohome'); ?>"
+													 type="checkbox" class="comicpress-field" value="yes"<?php if ($instance['lastgohome'] == "on") { echo ' checked="checked"'; } ?> />
 										<strong><?php _e('...go Home instead of Last', 'comicpress'); ?></strong>
 									</label>
 								</div>