diff --git a/view/theme/frost-mobile/templates/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl
deleted file mode 100644
index a386f30d00..0000000000
--- a/view/theme/frost-mobile/templates/suggest_friends.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-{{include file="section_title.tpl"}}
-
-{{foreach $entries as $entry}}
-	<div class="profile-match-wrapper">
-		<div class="profile-match-photo">
-			<a href="{{$entry.url}}">
-				<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url_clean}}]" onError="this.src='../../../images/person-48.jpg';" />
-			</a>
-		</div>
-		<div class="profile-match-break"></div>
-		<div class="profile-match-name">
-			<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
-		</div>
-		<div class="profile-match-end"></div>
-		{{if $entry.connlnk}}
-		<div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
-		{{/if}}
-		<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
-	</div>
-{{/foreach}}
-
-<div class="clear"></div>
diff --git a/view/theme/frost/templates/suggest_friends.tpl b/view/theme/frost/templates/suggest_friends.tpl
deleted file mode 100644
index a386f30d00..0000000000
--- a/view/theme/frost/templates/suggest_friends.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-{{include file="section_title.tpl"}}
-
-{{foreach $entries as $entry}}
-	<div class="profile-match-wrapper">
-		<div class="profile-match-photo">
-			<a href="{{$entry.url}}">
-				<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url_clean}}]" onError="this.src='../../../images/person-48.jpg';" />
-			</a>
-		</div>
-		<div class="profile-match-break"></div>
-		<div class="profile-match-name">
-			<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
-		</div>
-		<div class="profile-match-end"></div>
-		{{if $entry.connlnk}}
-		<div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
-		{{/if}}
-		<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
-	</div>
-{{/foreach}}
-
-<div class="clear"></div>
diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl
index 634630d9ab..7060505e9f 100644
--- a/view/theme/quattro/templates/contact_template.tpl
+++ b/view/theme/quattro/templates/contact_template.tpl
@@ -28,8 +28,9 @@
 	</div>
 	<div class="contact-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
 	{{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-	<div class="contact-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>
-	<div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+	{{if $contact.itemurl}}<div class="contact-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
+	{{if $contact.network}}<div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
+	{{if $contact.details}}<div class="contact-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
 
 	{{if $contact.connlnk}}
 	<div class="contact-entry-connect"><a href="{{$contact.connlnk}}" title="{{$contact.conntxt}}">{{$contact.conntxt}}</a></div>