diff --git a/include/Contact.php b/include/Contact.php
index 6eda0b6c5..7524c0cea 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -114,8 +114,8 @@ function contact_photo_menu($contact) {
 		$pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
 	}
 
-	$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
-	$posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+	$contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
+	$posts_link = $a->get_baseurl() . '/network/?cid=' . $contact['id'];
 
 	$menu = Array(
 		t("View status") => $status_link,
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index a74cebab5..2fa167feb 100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -1,23 +1,12 @@
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
 	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-nav-wrapper" >
-			<div class="contact-entry-direction-wrapper" >
-				<img class="contact-entry-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
-			</div>
-			<div class="contact-entry-direction-end" ></div>
-			<div class="contact-entry-edit-links" >
-				<a class="icon pencil" href="contacts/$id" class="contact-entry-edit-link" title="$edit_hover"></a>
-			</div>
-			<div class="contact-entry-edit-end"></div>
-		</div>
-		<div class="contact-entry-nav-end"></div>
 		<div class="contact-entry-photo" id="contact-entry-photo-$id"
-		onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)">
+		onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)" >
 
 			<a href="$url" title="$img_hover" /><img src="$thumb" $sparkle alt="$name" /></a>
 
-		<span onclick="openClose('contact-photo-menu-$id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$id">menu</span>
+			<span onclick="openClose('contact-photo-menu-$id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$id">menu</span>
                 <div class="contact-photo-menu" id="contact-photo-menu-$id">
                     <ul>
                         $contact_photo_menu
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 66e9f857e..e3c643bfc 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -743,7 +743,7 @@ input#dfrn-url {
 
 .contact-entry-wrapper {
 	float: left;
-	width: 180px;
+	width: 120px;
 	height: 120px;
 }
 
@@ -760,7 +760,7 @@ input#dfrn-url {
 }
 .contact-entry-name {
 	float: left;
-	margin-left: 30px;
+	margin-left: 0px;
 }
 .contact-entry-edit-links {
 	margin-top: 6px;
@@ -778,6 +778,7 @@ input#dfrn-url {
 }
 .contact-entry-photo {
 	float: left;
+	position: relative;
 }
 .contact-entry-end {
 	clear: both;
@@ -1461,15 +1462,14 @@ input#dfrn-url {
 
 
 .contact-photo-menu-button {
-	display: block;
-/*	position: absolute; */
+	position: absolute;
 	background-image: url("photo-menu.jpg");
 	background-position: top left; 
 	background-repeat: no-repeat;
 	margin: 0px; padding: 0px;
 	width: 16px;
 	height: 16px;
-	top: 60px; left:10px;
+	top: 64px; left:0px;
 	overflow: hidden;
 	text-indent: 40px;
 	display: none;
@@ -1479,8 +1479,8 @@ input#dfrn-url {
 	width: auto;
 	border: 2px solid #444444;
 	background: #FFFFFF;
-/*	position: absolute; */
-	left: 10px; top: 90px;
+	position: absolute;
+	left: 0px; top: 90px;
 	display: none;
 	z-index: 10000;
 }