diff --git a/mod/events.php b/mod/events.php
index 156b464ba7..642da3cb75 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -103,8 +103,23 @@ function events_content(&$a) {
 		return;
 	}
 
+	$o ="";
+	// tabs
+	$tpl = get_markup_template('profile_tabs.tpl');
+	$o .= replace_macros($tpl,array(
+		'$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
+		'$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
+		'$status' => t('Status'),
+		'$profile' => t('Profile'),
+		'$photos' => t('Photos'),
+		'$events' => t('Events') ,
+		'$notes' => t('Personal Notes'),
+		'$activetab' => "events",
+	));	
+
 	$o .= '<h2>' . t('Events') . '</h2>';
 
+
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
@@ -318,4 +333,4 @@ function events_content(&$a) {
 
 		return $o;
 	}
-}
\ No newline at end of file
+}
diff --git a/mod/notes.php b/mod/notes.php
index 0f980ff67f..9f1a4662da 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -36,6 +36,20 @@ function notes_content(&$a) {
 	$contact = $a->contact;
 
 	$is_owner = true;
+
+	$o ="";
+	// tabs
+	$tpl = get_markup_template('profile_tabs.tpl');
+	$o .= replace_macros($tpl,array(
+		'$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
+		'$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
+		'$status' => t('Status'),
+		'$profile' => t('Profile'),
+		'$photos' => t('Photos'),
+		'$events' => t('Events') ,
+		'$notes' => t('Personal Notes'),
+		'$activetab' => "notes",
+	));	
 	
 
 	$o .= '<h3>' . t('Personal Notes') . '</h3>';
diff --git a/mod/photos.php b/mod/photos.php
index e52f67008f..bbdb8b7e9e 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -80,15 +80,15 @@ EOT;
 
 function photos_post(&$a) {
 
-logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
+	logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
 
-foreach($_REQUEST AS $key => $val) {
-	logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
-}
+	foreach($_REQUEST AS $key => $val) {
+		logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
+	}
 
-foreach($_FILES AS $key => $val) {
-	logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
-}
+	foreach($_FILES AS $key => $val) {
+		logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
+	}
 
 	$can_post  = false;
 	$visitor   = 0;
@@ -836,6 +836,22 @@ function photos_content(&$a) {
 		);
 	}
 
+	$o = "";
+
+	// tabs
+	$tpl = get_markup_template('profile_tabs.tpl');
+	$_is_owner = (local_user() && (local_user() == $owner_uid));
+	$o .= replace_macros($tpl,array(
+		'$url' => $a->get_baseurl() . '/profile/' .$a->data['user']['nickname'],
+		'$phototab' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
+		'$status' => t('Status'),
+		'$profile' => t('Profile'),
+		'$photos' => t('Photos'),
+		'$events' => (($_is_owner) ? t('Events') : ''),
+		'$notes' => (($_is_owner) ? 	t('Personal Notes') : ''),
+		'$activetab' => "photos",
+	));	
+
 	//
 	// dispatch request
 	//
@@ -968,7 +984,7 @@ function photos_content(&$a) {
 
 
 
-		$o = '';
+		//$o = '';
 		// fetch image, item containing image, then comments
 
 		$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' 
@@ -1319,7 +1335,7 @@ function photos_content(&$a) {
 	}
 
 	// Default - show recent photos with upload link (if applicable)
-	$o = '';
+	//$o = '';
 
 	$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' 
 		$sql_extra GROUP BY `resource-id`",
diff --git a/mod/profile.php b/mod/profile.php
index 587ac6288e..f2dd7f4dfa 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -116,8 +116,9 @@ function profile_content(&$a, $update = 0) {
 			'$status' => t('Status'),
 			'$profile' => t('Profile'),
 			'$photos' => t('Photos'),
-			'$events' => (($is_owner) ? 	'<a href="events" id="profile-tab-events-link" class="profile-tabs" >' . t('Events') . '</a>' : ''),
-			'$notes' => (($is_owner) ? 	'<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >' . t('Personal Notes') . '</a>' : '')
+			'$events' => (($is_owner) ? t('Events') : ''),
+			'$notes' => (($is_owner) ? 	t('Personal Notes') : ''),
+			'$activetab' => $tab,
 		));
 
 
diff --git a/view/profile_tabs.tpl b/view/profile_tabs.tpl
index 3628ff5ff0..7820013b60 100644
--- a/view/profile_tabs.tpl
+++ b/view/profile_tabs.tpl
@@ -3,7 +3,7 @@
 	<a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a>
 	<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a>
 	<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a>
-	$events
-	$notes
+	{{ if $events }}<a href="events" id="profile-tab-events-link" class="profile-tabs" >$events</a>{{ endif }}
+	{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >$notes</a>{{ endif }}
 <div id="profile-tabs-end"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/theme/dispy/profile_tabs.tpl b/view/theme/dispy/profile_tabs.tpl
index 63b6d48dd2..c236490b28 100644
--- a/view/theme/dispy/profile_tabs.tpl
+++ b/view/theme/dispy/profile_tabs.tpl
@@ -1,7 +1,9 @@
 
 <div class="tabs-wrapper" >
-	<a href="$url" id="profile-tab-status-link" class="tabs" >$status</a>
-	<a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs" >$profile</a>
-	<a href="$phototab" id="profile-tab-photos-link" class="tabs" >$photos</a>
+	<a href="$url" id="profile-tab-status-link" class="tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
+	<a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
+	<a href="$phototab" id="profile-tab-photos-link" class="tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
+	{{ if $events }}<a href="events" id="profile-tab-events-link" class="tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
+	{{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}	
 <div class="tabs-end"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 34c880ac07..e0f5a46fbd 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -371,6 +371,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 .tabs-wrapper li { display: inline;}
 .tabs { padding: 0px 5px; margin-right: 10px; }
 .tabs:hover { background-color: #729fcf; color: #eeeeec; border: 0px; }
+.tabs.active { background-color: #729fcf; color: #eeeeec; border: 0px; }
 
 
 /**