diff --git a/core/control/ContentController.php b/core/control/ContentController.php
index 3ceedfa82..0c308feec 100755
--- a/core/control/ContentController.php
+++ b/core/control/ContentController.php
@@ -302,7 +302,7 @@ class ContentController extends Controller {
 			Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js');
 			Requirements::customScript(<<<JS
 				(function($) {
-					$('#switchView a').click(function() {
+					$('#switchView a.newWindow').click(function() {
 						var w = window.open(this.href,windowName(this.target));
 						w.focus();
 						return false;
@@ -341,7 +341,8 @@ JS
 					
 					$text = $obj->getHTML($this->dataRecord);
 					if($text) $items .= $text;
-					if(!$message) $message = $obj->getMessage($this);
+					$newMessage = $obj->getMessage($this);
+					if($newMessage) $message = $newMessage;
 				}
 			}
 
diff --git a/core/control/SilverStripeNavigatorItem.php b/core/control/SilverStripeNavigatorItem.php
index 6b2821cb9..ad4f37762 100644
--- a/core/control/SilverStripeNavigatorItem.php
+++ b/core/control/SilverStripeNavigatorItem.php
@@ -25,7 +25,7 @@ class SilverStripeNavigatorItem_StageLink extends SilverStripeNavigatorItem {
 	static $priority = 20;
 
 	function getHTML($controller) {
-		if(Versioned::current_stage() == 'Stage') {
+		if(Versioned::current_stage() == 'Stage' && !(ClassInfo::exists('SiteTreeFutureState') && SiteTreeFutureState::get_future_datetime())) {
 			return "<a class=\"current\">". _t('ContentController.DRAFTSITE', 'Draft Site') ."</a>";
 		} else {
 			$thisPage = $controller->Link();
diff --git a/css/SilverStripeNavigator.css b/css/SilverStripeNavigator.css
index d39cfc7e0..53ddf7b6c 100755
--- a/css/SilverStripeNavigator.css
+++ b/css/SilverStripeNavigator.css
@@ -7,7 +7,6 @@
 	border-top: 2px solid #d4d0c8;
 	background-color:#81858d;
 	height: 22px;
-	overflow:hidden;
 	background: #4d4e5a url(../../cms/images/textures/footerBg.gif) repeat-x left top;
 }
 
@@ -81,4 +80,4 @@
 	background:transparent url(../../cms/images/logout.gif) no-repeat scroll right top !important;
 	padding-bottom:4px;
 	padding-right:20px;
-}
\ No newline at end of file
+}