diff --git a/mod/contacts.php b/mod/contacts.php
index ef77366da7..c93b37bd87 100755
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -366,37 +366,58 @@ function contacts_content(&$a) {
 	}
 
 	$blocked = false;
+	$hidden = false;
+	$all = false;
 
 	$_SESSION['return_url'] = $a->query_string;
 
-	if(($a->argc == 2) && ($a->argv[1] === 'all'))
+	if(($a->argc == 2) && ($a->argv[1] === 'all')) {
 		$sql_extra = '';
-	else {
-		if(($a->argc == 2) && ($a->argv[1] === 'blocked')) {
-			$sql_extra = " AND `blocked` = 1 ";
-			$blocked = true;
-		}
-		else
-			$sql_extra = " AND `blocked` = 0 ";
+		$all = true;
 	}
+	elseif(($a->argc == 2) && ($a->argv[1] === 'blocked')) {
+		$sql_extra = " AND `blocked` = 1 ";
+		$blocked = true;
+	}
+	elseif(($a->argc == 2) && ($a->argv[1] === 'hidden')) {
+		$sql_extra = " AND `hidden` = 1 ";
+		$hidden = true;
+	}
+	else
+		$sql_extra = " AND `blocked` = 0 ";
+
 	$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
 	$nets = ((x($_GET,'nets')) ? notags(trim($_GET['nets'])) : '');
 
-	$tpl = get_markup_template("contacts-top.tpl");
-	$o .= replace_macros($tpl,array(
-		'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
-		'$hide_url' => (($blocked) ? 'contacts' : 'contacts/blocked'),
-		'$hide_text' => (($blocked) ? t('Show Unblocked Contacts') : t('Show Blocked Contacts')),
-		'$all_url' => 'contacts/all',
-		'$all_text' => t('Show All Contacts'),
-		'$search' => $search,
-		'$desc' => t('Search your contacts'),
-		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
-		'$submit' => t('Find'),
-		'$cmd' => $a->cmd
+	$tabs = array(
+		array(
+			'label' => t('All Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/all', 
+			'sel'   => ($all) ? 'active' : '',
+		),
+		array(
+			'label' => t('Unblocked Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts',
+			'sel'   => ((! $all) && (! $blocked) && (! $hidden)) ? 'active' : '',
+		),
+
+		array(
+			'label' => t('Blocked Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/blocked',
+			'sel'   => ($blocked) ? 'active' : '',
+		),
+		array(
+			'label' => t('Hidden Contacts'),
+			'url'   => $a->get_baseurl() . '/contacts/hidden',
+			'sel'   => ($hidden) ? 'active' : '',
+		),
+	);
+
+	$tab_tpl = get_markup_template('common_tabs.tpl');
+	$t = replace_macros($tab_tpl, array('$tabs'=>$tabs));
+
 
 
-	)); 
 
 	if($search)
 		$search = dbesc($search.'*');
@@ -414,6 +435,21 @@ function contacts_content(&$a) {
 	if(count($r))
 		$a->set_pager_total($r[0]['total']);
 
+
+	$tpl = get_markup_template("contacts-top.tpl");
+	$o .= replace_macros($tpl,array(
+		'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
+		'$tabs' => $t,
+		'$total' => $r[0]['total'],
+		'$search' => $search,
+		'$desc' => t('Search your contacts'),
+		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
+		'$submit' => t('Find'),
+		'$cmd' => $a->cmd
+
+
+	)); 
+
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
 		intval($_SESSION['uid']),
 		intval($a->pager['start']),
diff --git a/view/contacts-top.tpl b/view/contacts-top.tpl
index b8972834c7..09421a1d3f 100755
--- a/view/contacts-top.tpl
+++ b/view/contacts-top.tpl
@@ -1,7 +1,9 @@
-<h1>$header</h1>
+<h1>$header{{ if $total }} ($total){{ endif }}</h1>
 
 $finding
 
+$tabs
+
 <div id="contacts-search-wrapper">
 <form id="contacts-search-form" action="$cmd" method="get" >
 <span class="contacts-search-desc">$desc</span>
@@ -13,7 +15,3 @@ $finding
 
 
 
-<div id="contacts-main" >
-<a href="$hide_url" id="contacts-show-hide-link">$hide_text</a><br />
-<a href="$all_url" id="contacts-show-all-link">$all_text</a><br />
-</div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 60fe4fb283..fbbcaab688 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -809,6 +809,9 @@ input#dfrn-url {
 	width: 120px;
 	height: 120px;
 }
+#contacts-search-end {
+	margin-bottom: 10px;
+}
 
 .contact-entry-direction-icon {
 	margin-top: 24px;