diff --git a/functions.php b/functions.php
index 8136f3f..662cf4a 100644
--- a/functions.php
+++ b/functions.php
@@ -325,23 +325,44 @@ function get_terminal_post_in_category($categoryID, $first = true) {
 /**
  * Find the first post in the storyline prior to the current one.
  */
+function get_previous_storyline_start() {
+  if (($category_id = get_adjacent_storyline_category_id(true)) !== false) {
+    return get_terminal_post_in_category($category_id);
+  }
+  return false;
+}
+
 function get_previous_storyline_start_permalink() {
+	$prev_story = get_previous_storyline_start();
+	if (is_object($prev_story)) {
+		if (isset($prev_story->ID)) {
+			return get_permalink($prev_story->ID);
+		}
+	}
+	return false;
+}
+
+/**
+ * Find the first post in the storyline following to the current one.
+ */
+function get_next_storyline_start() {
   if (($category_id = get_adjacent_storyline_category_id()) !== false) {
     return get_terminal_post_in_category($category_id);
   }
   return false;
 }
 
-/**
- * Find the first post in the storyline following to the current one.
- */
 function get_next_storyline_start_permalink() {
-  if (($category_id = get_adjacent_storyline_category_id(true)) !== false) {
-    return get_terminal_post_in_category($category_id);
-  }
-  return false;
+	$next_story = get_next_storyline_start();
+	if (is_object($next_story)) {
+		if (isset($next_story->ID)) {
+			return get_permalink($next_story->ID);
+		}
+	}
+	return false;
 }
 
+
 function get_adjacent_storyline_category_id($next = false) {
   global $post, $category_tree;
 
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index 1405361..c8f6e19 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -32,6 +32,9 @@ function display_comic_post() {
 			<div class="post-text">
 				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
 				<small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?></small><br />
+				<?php if (get_option('comicpress-enable-storyline-support') == 1) { ?>
+					<ul class="storyline-cats"><li class="storyline-root"><?php the_category(' &raquo; </li><li>', multiple) ?></li></ul>
+				<?php } ?>
 				<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
 			</div>
 			<div class="clear"></div>
diff --git a/sidebar-right.php b/sidebar-right.php
index b0e99f0..aa9a8ca 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -8,7 +8,7 @@
 				<?php if (is_cp_theme_style('standard,v')) { ?>
 				<ul>
 					<li>
-						<?php get_calendar() ?>
+						<?php comicpress_calendar() ?>
 					</li>
 				</ul>
 				<?php } ?>
diff --git a/style.css b/style.css
index a64b237..c304348 100644
--- a/style.css
+++ b/style.css
@@ -22,33 +22,27 @@ body {
 	z-index: 0;
 }
 
-
 a {
 	color: #800;
 	text-decoration: none;
 }
 
-
 a:hover {
 	color: #f00;
 }
 
-
 a:focus {
 	outline: none;
 }
 
-
 a img {
 	border: none;
 }
 
-
 p {
 	margin: 12px 0;
 }
 
-
 img {
 	max-width: 100%;
 	padding: 0;
@@ -210,159 +204,159 @@ h3, h3 a {
 	background: url('images/menu.png');
 	text-align: left;
 	border: 1px solid #999;
-	}
+}
 
 #menunav {
 	float: right;
-	text-align: center;	
-	}
-	
-	.menunav-search {
-		padding: 1px 1px 0 0;
-		float: left;
-		}
-	
-	.menunav-rss {
-		width: 25px;
-		height: 25px;
-		margin: 0 0 0 4px;
-		display: block;
-		float: left;
-		text-indent: -9999px;
-		overflow: hidden;
-		background: url('images/menu-nav.png') no-repeat;
-		}
-		
-		.menunav-rss:hover {
-			background-position: 0 -25px;
-			}
+	text-align: center;
+}
 
-	.menunav-prev, .menunav-next {
-		display: block;
-		float: left;
-		}
+.menunav-search {
+	padding: 1px 1px 0 0;
+	float: left;
+}
 
-	.menunav-prev {
-		margin: 0 0 0 5px;
-	}
+.menunav-rss {
+	width: 25px;
+	height: 25px;
+	margin: 0 0 0 4px;
+	display: block;
+	float: left;
+	text-indent: -9999px;
+	overflow: hidden;
+	background: url('images/menu-nav.png') no-repeat;
+}
 
-	.menunav-prev a, .menunav-next a {
-		width: 25px;
-		height: 25px;
-		display: block;
-		text-indent: -9999px;
-		overflow: hidden;
-		}
-		
-		.menunav-prev a {
-			background: url('images/menu-nav.png') -25px 0 no-repeat;
-		}
-			
-			.menunav-prev a:hover {
-				background-position: -25px -25px;
-			}
-			
-		.menunav-next a {
-			background: url('images/menu-nav.png') -50px 0 no-repeat;
-		}
-			
-			.menunav-next a:hover {
-				background-position: -50px -25px;
-			}
+.menunav-rss:hover {
+	background-position: 0 -25px;
+}
+
+.menunav-prev, .menunav-next {
+	display: block;
+	float: left;
+}
+
+.menunav-prev {
+	margin: 0 0 0 5px;
+}
+
+.menunav-prev a, .menunav-next a {
+	width: 25px;
+	height: 25px;
+	display: block;
+	text-indent: -9999px;
+	overflow: hidden;
+}
+
+.menunav-prev a {
+	background: url('images/menu-nav.png') -25px 0 no-repeat;
+}
+
+.menunav-prev a:hover {
+	background-position: -25px -25px;
+}
+
+.menunav-next a {
+	background: url('images/menu-nav.png') -50px 0 no-repeat;
+}
+
+.menunav-next a:hover {
+	background-position: -50px -25px;
+}
 
 #menu {
-    padding: 0;
-    margin: 0;
+	padding: 0;
+	margin: 0;
 	list-style: none;
-    float: left;
-    line-height: 25px;
+	float: left;
+	line-height: 25px;
 	font-size: 13px;
 	border-right: 1px solid #aaa;
-    }
+}
 
-	#menu a {
-		padding: 0px 10px 0 10px;
-		display: block;
-		color: #000;
-		text-decoration: none;
-		}
+#menu a {
+	padding: 0px 10px 0 10px;
+	display: block;
+	color: #000;
+	text-decoration: none;
+}
 
-	#menu li .rss {
-		padding: 5px 0 5px 0; 
-	}
-	
+#menu li .rss {
+	padding: 5px 0 5px 0;
+}
 
-	#menu li {
-		float: left;
-		}
-		
-	#menu li a {
-		border-left: 1px solid #aaa;
-		border-right: 1px solid #fff;
-		}
 
-	#menu li:hover a, #menu li.sfhover a {
-		border-left: 1px solid #8b160f;
-		border-right: 1px solid #c28380;
-	    color: #fff; /* Main menu highlighted text color */
-		background: url('images/menu.png') 0 -75px;
-	    }
+#menu li {
+	float: left;
+}
 
-	#menu li:hover, #menu li.sfhover {
-	     /* Main menu highlighted background color */
-	    }
-	
-	/* For submenu dropdowns - this order must be maintained */
+#menu li a {
+	border-left: 1px solid #aaa;
+	border-right: 1px solid #fff;
+}
 
-	#menu ul {
-		padding: 0;
-		margin: 0;
-		list-style: none;
-		position: absolute;
-		left: -9999px;
-		width: 175px;
-		line-height: 1;
-		}
-	#menu li li {
-		width: 165px;
-		padding: 4px 5px;
-		color: #fff;
-		}
-	#menu li li a {
-		width: 174px;
-		padding: 0;
-		color: #fff;
-		border: none;
-		}
-	#menu li ul ul {
-	    margin: -17px 0 0 170px;
-	    }
-	#menu li ul li:hover a, #menu li ul li li:hover a, #menu li ul li li li:hover a, #menu li ul li li li:hover a {
-	    color: #fff; /*Submenu highlighted text color */
-	    }
-	#menu li:hover li a, #menu li li:hover li a, #menu li li li:hover li a, #menu li li li li:hover li a  {
-	    color: #fff; /*Submenu text color */
-		border: none;
-		background: none;
-	    }
-	#menu li li:hover {
-	    background: #f00; /*Submenu highlighted background color */
-	    }
-	#menu li:hover ul ul, #menu li:hover ul ul ul, #menu li:hover ul ul ul ul, #menu li.sfhover ul ul, #menu li.sfhover ul ul ul, #menu li.sfhover ul ul ul ul {
-	    left: -9999px;
-	    }
-	#menu li:hover ul, #menu li li:hover ul, #menu li li li:hover ul, #menu li li li li:hover ul, #menu li.sfhover ul, #menu li li.sfhover ul, #menu li li li.sfhover ul, #menu li li li li.sfhover ul {
-	    left: auto;	    
-	    background: #000; /* Submenu background color */
-		text-transform: none;
-	    }
-	    
-	#menu .current_page_item a {
-		color: #fff;
-		border-left: 1px solid #555;
-		border-right: 1px solid #555;
-		background: url('images/menu.png') 0 -50px;
-	}
+#menu li:hover a, #menu li.sfhover a {
+	border-left: 1px solid #8b160f;
+	border-right: 1px solid #c28380;
+	color: #fff; /* Main menu highlighted text color */
+	background: url('images/menu.png') 0 -75px;
+}
+
+#menu li:hover, #menu li.sfhover {
+	/* Main menu highlighted background color */
+}
+
+/* For submenu dropdowns - this order must be maintained */
+
+#menu ul {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	position: absolute;
+	left: -9999px;
+	width: 175px;
+	line-height: 1;
+}
+#menu li li {
+	width: 165px;
+	padding: 4px 5px;
+	color: #fff;
+}
+#menu li li a {
+	width: 174px;
+	padding: 0;
+	color: #fff;
+	border: none;
+}
+#menu li ul ul {
+	margin: -17px 0 0 170px;
+}
+#menu li ul li:hover a, #menu li ul li li:hover a, #menu li ul li li li:hover a, #menu li ul li li li:hover a {
+	color: #fff; /*Submenu highlighted text color */
+}
+#menu li:hover li a, #menu li li:hover li a, #menu li li li:hover li a, #menu li li li li:hover li a {
+	color: #fff; /*Submenu text color */
+	border: none;
+	background: none;
+}
+#menu li li:hover {
+	background: #f00; /*Submenu highlighted background color */
+}
+#menu li:hover ul ul, #menu li:hover ul ul ul, #menu li:hover ul ul ul ul, #menu li.sfhover ul ul, #menu li.sfhover ul ul ul, #menu li.sfhover ul ul ul ul {
+	left: -9999px;
+}
+#menu li:hover ul, #menu li li:hover ul, #menu li li li:hover ul, #menu li li li li:hover ul, #menu li.sfhover ul, #menu li li.sfhover ul, #menu li li li.sfhover ul, #menu li li li li.sfhover ul {
+	left: auto;
+	background: #000; /* Submenu background color */
+	text-transform: none;
+}
+
+#menu .current_page_item a {
+	color: #fff;
+	border-left: 1px solid #555;
+	border-right: 1px solid #555;
+	background: url('images/menu.png') 0 -50px;
+}
 
 
 
@@ -370,9 +364,9 @@ h3, h3 a {
 
 
 #comic {
-	background:#fff;
-	padding:10px 0;
-	border:1px solid #999;
+	background: #fff;
+	padding: 10px 0;
+	border: 1px solid #999;
 	text-align: center;
 	z-index: 100;
 }
@@ -907,11 +901,11 @@ ul.children {
 	margin: 0 auto;
 }
 
-	.wp-calendar-thumb {
-		width: 178px;
-		height: 130px;
-		margin: 0 auto;
-	}
+.wp-calendar-thumb {
+	width: 178px;
+	height: 130px;
+	margin: 0 auto;
+}
 
 
 #wp-calendar th {
@@ -1211,25 +1205,20 @@ li.pingback div p, li.trackback div p {
 	margin-left: 0;
 }
 
-
 /* STORYLINES */
 
-
-#storyline-cats {
+.storyline-cats {
 	padding: 0;
-	margin: 0 10px 0 0;
+	margin: 0;
 	list-style: none;
 }
 
-
-#storyline-cats li {
+.storyline-cats li {
 	display: inline;
 }
 
-
-#storyline-cats ul {
-	display: inline;
-	margin-right: 10px;
+li.storyline-root {
+	display: none;
 }
 
 
@@ -1240,11 +1229,6 @@ li.pingback div p, li.trackback div p {
 	clear: both;
 }
 
-
-
-
-
-
 /* CLEAR MARGINS */
 /* Used with BR for clearing paragraph margins for Safari, Chrome - avoid background gaps */
 
@@ -1256,12 +1240,6 @@ li.pingback div p, li.trackback div p {
 	font-size: 0;
 }
 
-
-
-
-
-
-
 /** BUY THIS **/
 
 
@@ -1286,7 +1264,6 @@ li.pingback div p, li.trackback div p {
 	width: 100%;
 }
 
-
 .headerpwad {
 	float: right;
 	margin: 5px 5px 0 0;
@@ -1298,11 +1275,8 @@ li.pingback div p, li.trackback div p {
 	text-align: center;
 }
 
-
-
 /* Archive Calendar Template */
 
-
 .cpcal-month {
 	width: 157px;
 	height: 138px;
@@ -1323,6 +1297,7 @@ li.pingback div p, li.trackback div p {
 	line-height: 16px;
 	letter-spacing: -1px;
 }
+
 .cpcal-dayletter {
 	width: 20px;
 	height: 15px;
@@ -1362,7 +1337,6 @@ li.pingback div p, li.trackback div p {
 
 /* Storyline Template */
 
-
 #storyline, #storyline ul {
 	padding: 0;
 	margin: 0;
@@ -1621,11 +1595,8 @@ a.tt:hover span.bottom {
 	padding: 0;
 }
 
-
 .userpage-posts li {
 	list-style: none;
 	margin: 0;
 	padding: 0;
 }
-
-
diff --git a/widgets/graphical-navigation.php b/widgets/graphical-navigation.php
index 70a38f1..8091f79 100644
--- a/widgets/graphical-navigation.php
+++ b/widgets/graphical-navigation.php
@@ -25,14 +25,13 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		$wp_query->is_single = true;
 		$prev_comic = get_previous_comic_permalink();
 		$next_comic = get_next_comic_permalink();
+		$prev_story = get_previous_storyline_start_permalink();
+		$next_story = get_next_storyline_start_permalink();
 		$wp_query->is_single = $temp_query;
 		$temp_query = null;
 		
 		$first_comic = get_first_comic_permalink();
 		$last_comic = get_last_comic_permalink(); 
-		
-		$prev_story = get_previous_storyline_start_permalink();
-		$next_story = get_next_storyline_start_permalink();
 		?>
 				
 <div id="comic_navi_wrapper">