diff --git a/comicpress-options-config.php b/comicpress-options-config.php
index 9280ce3..0635618 100644
--- a/comicpress-options-config.php
+++ b/comicpress-options-config.php
@@ -173,6 +173,22 @@ $options = array (
 			"id" => "comicpress-graphicnav_directory",
 			"default" => "scifi",
 			"type" => "comicpress-graphicnav_directory"),
+		
+		array(
+			"id" => "comicpress-enable_search_in_menubar",
+			"default" => "no",
+			"type" => "comicpress-enable_search_in_menubar"),
+			
+		array(
+			"id" => "comicpress-enable_rss_in_menubar",
+			"default" => "no",
+			"type" => "comicpress-enable_rss_in_menubar"),
+			
+		array(
+			"id" => "comicpress-enable_navigation_in_menubar",
+			"default" => "yes",
+			"type" => "comicpress-enable_navigation_in_menubar"),
+			
 
 		array("type" => "close")
 		);
diff --git a/comicpress-options.php b/comicpress-options.php
index 4d8393b..28597b1 100644
--- a/comicpress-options.php
+++ b/comicpress-options.php
@@ -149,6 +149,45 @@ function comicpress_admin() {
 				</tr>
 				
 				<?php break;				
+			case "comicpress-enable_search_in_menubar": ?>
+				<tr>
+				<th scope="row"><strong>Enable Search Form in Menubar?</strong><br /><br /></th>
+				<td valign="top">
+				<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-yes" type="radio" value="yes"<?php if ( get_option( $value['id'] ) == "yes") { echo " checked"; } ?> />Yes</label>
+				&nbsp;&nbsp;
+				<label><input  name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-no" type="radio" value="no"<?php if ( get_option( $value['id'] ) == "no") { echo " checked"; } ?> />No</label>
+				</td>
+				<td valign="top">
+				</td>
+				</tr>
+				
+				<?php break;
+			case "comicpress-enable_rss_in_menubar": ?>
+				<tr>
+				<th scope="row"><strong>Enable RSS Link in Menubar?</strong><br /><br /></th>
+				<td valign="top">
+				<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-yes" type="radio" value="yes"<?php if ( get_option( $value['id'] ) == "yes") { echo " checked"; } ?> />Yes</label>
+				&nbsp;&nbsp;
+				<label><input  name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-no" type="radio" value="no"<?php if ( get_option( $value['id'] ) == "no") { echo " checked"; } ?> />No</label>
+				</td>
+				<td valign="top">
+					</td>
+				</tr>
+				
+				<?php break;
+			case "comicpress-enable_navigation_in_menubar": ?>
+				<tr>
+				<th scope="row"><strong>Enable extra Navigation options in the Menubar?</strong><br /><br /></th>
+				<td valign="top">
+				<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-yes" type="radio" value="yes"<?php if ( get_option( $value['id'] ) == "yes") { echo " checked"; } ?> />Yes</label>
+				&nbsp;&nbsp;
+				<label><input  name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-no" type="radio" value="no"<?php if ( get_option( $value['id'] ) == "no") { echo " checked"; } ?> />No</label>
+				</td>
+				<td valign="top">
+					</td>
+				</tr>
+				
+				<?php break;
 			case "comicpress-contact_in_menubar": ?>
 				<tr>
 				<th scope="row"><strong>Contact Link in Menubar</strong><br /><br />Setting to &quot;Yes&quot will put [&nbsp;CONTACT&nbsp;] in the menubar and associate it with your admin's email.</th>
diff --git a/functions.php b/functions.php
index 83ee0ad..7fc67bd 100644
--- a/functions.php
+++ b/functions.php
@@ -70,6 +70,9 @@ if (get_option('upload_path') !== false) {
 				'disable_categories_in_posts'	=> 'disable_categories_in_posts',
 				'moods_directory'				=> 'moods_directory',
 				'graphicnav_directory'			=> 'graphicnav_directory',
+				'enable_search_in_menubar'		=> 'enable_search_in_menubar',
+				'enable_rss_in_menubar'			=> 'enable_rss_in_menubar',
+				'enable_navigation_in_menubar'	=> 'enable_navigation_in_menubar',
 				'contact_in_menubar'			=> 'contact_in_menubar' ) as $options => $variable_name) {
 		$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
 	}
diff --git a/images/background.jpg b/images/background.jpg
new file mode 100644
index 0000000..dd15c92
Binary files /dev/null and b/images/background.jpg differ
diff --git a/images/browse-search.png b/images/browse-search.png
index 5565968..320e8d6 100644
Binary files a/images/browse-search.png and b/images/browse-search.png differ
diff --git a/images/menu-nav.png b/images/menu-nav.png
new file mode 100644
index 0000000..3177046
Binary files /dev/null and b/images/menu-nav.png differ
diff --git a/images/menu.png b/images/menu.png
new file mode 100644
index 0000000..cd43703
Binary files /dev/null and b/images/menu.png differ
diff --git a/images/nav/default/navstyle.css b/images/nav/default/navstyle.css
index 605fffe..3eb7162 100644
--- a/images/nav/default/navstyle.css
+++ b/images/nav/default/navstyle.css
@@ -15,7 +15,7 @@ Style: Default
 .navi {
 	width: 66px;
 	padding: 66px 0 0 0;
-	margin: 0 5px;
+/*	margin: 0 5px; */
 	display: block;
 	float: left;
 	overflow: hidden;
@@ -42,6 +42,11 @@ Style: Default
 	background: url('prev.png') no-repeat;
 }
 
+
+.navi-comments, .navi-archive, .navi-random, .navi-buyprint {
+	margin: 0 5px;
+}
+
 .navi-buyprint {
 	border: none;
 	cursor: pointer;
@@ -107,5 +112,6 @@ Style: Default
 }
 
 .comic-left .navi-prev, .comic-right .navi-prev, .comic-left .navi-next, .comic-right .navi-next {
-	margin: 0 5px;
-	}
\ No newline at end of file
+/*	margin: 0 5px; */
+	}
+
diff --git a/sidebar-left.php b/sidebar-left.php
index 3a94f85..b273204 100644
--- a/sidebar-left.php
+++ b/sidebar-left.php
@@ -4,7 +4,7 @@
 		<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left Sidebar') ) : ?> 
 			<ul>
 				<li>
-					<?php get_calendar() ?>
+					<?php comicpress_calendar() ?>
 				</li>
 			</ul>
 			<?php comicpress_latest_comics() ?>
diff --git a/sidebar-right.php b/sidebar-right.php
index 734d5a7..b0e99f0 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -2,6 +2,7 @@
 <div id="sidebar-right">
 	<div class="sidebar">
 			<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right Sidebar') ) : ?>
+				<br />
 				<?php comicpress_comic_bookmark() ?>
 				
 				<?php if (is_cp_theme_style('standard,v')) { ?>
@@ -24,13 +25,7 @@
 				<ul><?php wp_list_categories('title_li=<h2>Categories</h2>') ?></ul>
 
 				<ul><?php wp_list_bookmarks() ?></ul>
-				<ul>
-					<li>
-						<ul>
-							<?php include(get_template_directory() . '/searchform.php'); ?>
-						</ul>
-					</li>
-				</ul>
+
 			<?php endif; ?>
 	</div>
 </div>
diff --git a/style.css b/style.css
index e0f21ec..0a1c049 100644
--- a/style.css
+++ b/style.css
@@ -207,110 +207,162 @@ h3, h3 a {
 /* THE MENU */
 
 #menubar {
-	background: #000 /* url('images/menubarbgdark.jpg') repeat-x*/;
+	background: url('images/menu.png');
 	text-align: left;
-}
+	border: 1px solid #999;
+	}
 
 #menunav {
 	float: right;
-	text-align: center;
-}
+	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;
+			}
 
-#menunav a {
-	width: 25px;
-	height: 25px;
-	display: block;
-	float: left;
-	color: #fff;
-	font-size: 19px;
-	font-weight: bold;
-	line-height: 24px;
-}
+	.menunav-prev, .menunav-next {
+		display: block;
+		float: left;
+		}
 
-#menunav a:hover {
-	background: #800;
-}
+	.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;
-	text-transform: uppercase;
-}
+	border-right: 1px solid #aaa;
+    }
 
-#menu a {
-	padding: 0px 10px 0 10px;
-	display: block;
-	color: #fff;
-	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 {
-	float: left;
-}
+	#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 a, #menu li.sfhover a {
-	color: #fff; /* Main menu highlighted text color */
-}
+	#menu li:hover, #menu li.sfhover {
+	     /* Main menu highlighted background color */
+	    }
+	
+	/* For submenu dropdowns - this order must be maintained */
 
-#menu li:hover, #menu li.sfhover {
-	background: #800; /* 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 */
-}
-#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: #fff000;
-}
+	#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;
+	}
 
 
 
@@ -318,7 +370,10 @@ h3, h3 a {
 
 
 #comic {
-	padding: 0;
+	background:#fff;
+	padding:10px 0;
+	border:1px solid #999;
+	margin:10px 0 0 0;
 	text-align: center;
 	z-index: 100;
 }
@@ -356,7 +411,7 @@ h3, h3 a {
 	font-size: 12px;
 	font-weight: bold;
 	margin-right: 10px;
-	padding: 5px;
+	padding: 8px 5px 5px 5px;
 }
 
 .nav-first {
diff --git a/widgets/calendar.php b/widgets/calendar.php
index 3fd2b42..584b61a 100644
--- a/widgets/calendar.php
+++ b/widgets/calendar.php
@@ -9,6 +9,15 @@ Author URI: http://webcomicplanet.com/
 
 */
 
+function comicpress_calendar() {
+	global $post; ?>
+	<div id="wp-calendar-top"></div>
+	<div id="wp-calendar-wrap">
+	<?php get_calendar(); ?>
+	</div>
+	<div id="wp-calendar-bottom"></div>
+<?php }
+
 class widget_comicpress_calendar extends WP_Widget {
 	
 	function widget_comicpress_calendar() {
@@ -23,7 +32,7 @@ class widget_comicpress_calendar extends WP_Widget {
 		echo $before_widget;
 		$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']); 
 		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; };
-		get_calendar();
+		comicpress_calendar();
 		echo $after_widget;
 	}
 	
diff --git a/widgets/latestthumb.php b/widgets/latestthumb.php
index c1d6496..5bcedc4 100644
--- a/widgets/latestthumb.php
+++ b/widgets/latestthumb.php
@@ -18,18 +18,20 @@ class widget_comicpress_latest_thumbnail extends WP_Widget {
 	
 	function widget($args, $instance) {
 		global $post;
-		extract($args, EXTR_SKIP); 
-		
-		echo $before_widget;
-		$title = empty($instance['title']) ? 'Latest Comic' : apply_filters('widget_title', $instance['title']); 
-		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }; 
-		$latestcomics = get_posts('numberposts=1&category='.get_all_comic_categories_as_cat_string());
-		foreach($latestcomics as $post) : ?>
-		<center>
-			<a href="<?php the_permalink(); ?>"><img src="<?php the_comic_rss() ?>" alt="<?php the_title() ?>" title="<?php the_hovertext() ?>" /></a><br />
-		</center>
-		<?php endforeach; 
-		echo $after_widget;
+		if (is_home()) {
+			extract($args, EXTR_SKIP); 
+			
+			echo $before_widget;
+			$title = empty($instance['title']) ? 'Latest Comic' : apply_filters('widget_title', $instance['title']); 
+			if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }; 
+			$latestcomics = get_posts('numberposts=1&category='.get_all_comic_categories_as_cat_string());
+			foreach($latestcomics as $post) : ?>
+				<center>
+				<a href="<?php the_permalink(); ?>"><img src="<?php the_comic_rss() ?>" alt="<?php the_title() ?>" title="<?php the_hovertext() ?>" /></a><br />
+				</center>
+				<?php endforeach; 
+			echo $after_widget;
+		}
 	}
 	
 	function update($new_instance, $old_instance) {
diff --git a/widgets/menubar.php b/widgets/menubar.php
index 7093a42..07cb117 100644
--- a/widgets/menubar.php
+++ b/widgets/menubar.php
@@ -11,7 +11,7 @@ Author URI: http://webcomicplanet.com/
 
 
 function comicpress_menubar() {
-	global $contact_in_menubar;
+	global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar;
 	if (file_exists(get_template_directory() . '/custom-menubar.php') || function_exists('suckerfish')) {
 		if (function_exists('suckerfish')) { 
 			suckerfish();
@@ -21,20 +21,33 @@ function comicpress_menubar() {
 	} else { ?>
 <div id="menubar">
 
-	<div id="menunav">
-	<?php if (is_home()) {
-		$comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
-		while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
-			global $wp_query; $wp_query->is_single = true;
-			previous_comic_link('%link', '&lsaquo;');
-			$wp_query->is_single = false;
-		endwhile; 
-	} elseif (is_single() & in_comic_category()) {
-		previous_comic_link('%link', '&lsaquo;');
-		next_comic_link('%link', '&rsaquo;');
-		} ?>
+		<div id="menunav">
+		<?php if ($enable_search_in_menubar == 'yes') { ?>
+			<div class="menunav-search"><?php include(get_template_directory() . '/searchform.php'); ?></div>
+		<?php } ?>
+		<?php if ($enable_rss_in_menubar == 'yes') { ?>
+			<a href="<?php bloginfo('rss2_url') ?>" title="RSS Feed" class="menunav-rss">RSS</a>
+		<?php } ?>
+		<?php if ($enable_navigation_in_menubar == 'yes') { ?>
+			<?php if (is_home()) {
+				$comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
+				while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post();
+					global $wp_query; $wp_query->is_single = true; ?>
+					<div class="menunav-prev">
+					<?php previous_comic_link('%link', '&lsaquo;'); ?>
+					</div>
+					<?php $wp_query->is_single = false;
+				endwhile; 
+			} elseif (is_single() & in_comic_category()) { ?>
+				<div class="menunav-prev">
+				<?php previous_comic_link('%link', '&lsaquo;'); ?>
+				</div>
+				<div class="menunav-next">
+				<?php next_comic_link('%link', '&rsaquo;'); ?>
+				</div>
+			<?php } ?>
+		<?php } ?>
 	</div>
-
 	<?php 
 	$menulinks = wp_list_bookmarks('echo=0&title_li=&categorize=0&title_before=&title_after=&category_name=menubar');
 	$menulinks = preg_replace('#<li ([^>]*)>#', '<li class="page-item link">', $menulinks);
@@ -66,7 +79,6 @@ function comicpress_menubar() {
 	<?php if ($contact_in_menubar == 'yes') { ?>
 		<li class="page_item page-item-contact"><a href="mailto:<?php bloginfo('admin_email'); ?>">Contact</a></li>
 	<?php } ?>
-		<li class="page_item page-item-rss"><a href="<?php bloginfo('rss2_url'); ?>"><img src="<?php bloginfo('stylesheet_directory'); ?>/images/data_rss.gif" class="rss" alt="RSS" /></a></li>		    
 	</ul>
 	<div class="clear"></div>
 </div>