diff --git a/actions/all.php b/actions/all.php
index e51dc375c8..83401d422d 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -46,7 +46,9 @@ class AllAction extends StreamAction {
 
 		common_show_header($profile->nickname . _t(" and friends"),
 						   array($this, 'show_header'), $user);
-
+		
+		$this->views_menu();
+		
 		$this->show_notices($profile);
 		
 		common_show_footer();
diff --git a/actions/showstream.php b/actions/showstream.php
index f8446e008a..2130251ce1 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -53,7 +53,9 @@ class ShowstreamAction extends StreamAction {
 																   $user->nickname)));
 
 		common_show_header($profile->nickname, array($this, 'show_header'), $user);
-
+		
+		$this->views_menu();
+		
 		$this->show_profile($profile);
 
 		$this->show_notices($profile);
diff --git a/lib/stream.php b/lib/stream.php
index 9a4cf41ebe..d8bd1f5629 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -27,6 +27,24 @@ class StreamAction extends Action {
 		parent::handle($args);
 	}
 
+	function views_menu() {
+		$action = $this->trimmed('action');
+		$nickname = $this->trimmed('nickname');
+		
+		common_element_start('ul', array('id' => 'nav_views'));
+		common_menu_item(common_local_url('showstream', array('nickname' =>
+															  $nickname)),
+						 _t('Profile'),  
+						 ($user->fullname) ? $user->fullname : $nickname,
+						 $action == 'showstream');
+		common_element_end('ul');
+		common_menu_item(common_local_url('all', array('nickname' =>
+													   $nickname)),
+						 _t('All'),
+						 _t('All'),
+						 $action == 'all');
+	}
+	
 	function show_notice($notice) {
 		global $config;
 		$profile = $notice->getProfile();
diff --git a/lib/util.php b/lib/util.php
index 172b7a6b92..def3a57506 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -232,19 +232,6 @@ function common_nav_menu() {
 	common_element_end('ul');
 }
 
-function common_views_menu($selected=NULL) {
-	$user = common_current_user();
-	common_element_start('ul', array('id' => 'nav_views'));
-	common_menu_item(common_local_url('all', array('nickname' =>
-												   $user->nickname)),
-					 _t('Home'));
-	common_menu_item(common_local_url('showstream', array('nickname' =>
-														  $user->nickname)),
-					 _t('Profile'),  
-					 ($user->fullname) ? $user->fullname : $user->nickname);
-	common_element_end('ul');
-}
-
 function common_foot_menu() {
 	common_element_start('ul', array('id' => 'nav_sub'));
 	common_menu_item(common_local_url('doc', array('title' => 'about')),
@@ -256,12 +243,16 @@ function common_foot_menu() {
 	common_element_end('ul');
 }
 
-function common_menu_item($url, $text, $title=NULL) {
+function common_menu_item($url, $text, $title=NULL, $is_selected) {
+	$lattrs = array();
+	if ($is_selected) {
+		$lattrs['class'] = 'current';
+	}
+	common_element_start('li', $lattrs);
 	$attrs['href'] = $url;
 	if ($title) {
 		$attrs['title'] = $title;
 	}
-	common_element_start('li');
 	common_element('a', $attrs, $text);
 	common_element_end('li');
 }