diff --git a/mod/directory.php b/mod/directory.php
index 7c7f63037..67074d8cd 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -13,6 +13,7 @@ function directory_init(&$a) {
 			intval(local_channel()),
 			dbesc($_GET['ignore'])
 		);
+		goaway(z_root() . '/directory?suggest=1');
 	}
 
 	$observer = get_observer_hash();
@@ -200,22 +201,24 @@ function directory_content(&$a) {
 						if(in_array($rr['hash'],$contacts))
 							$connect_link = '';
 
-						$details = '';
+						$location = '';
 						if(strlen($rr['locale']))
-							$details .= $rr['locale'];
+							$location .= $rr['locale'];
 						if(strlen($rr['region'])) {
 							if(strlen($rr['locale']))
-								$details .= ', ';
-							$details .= $rr['region'];
+								$location .= ', ';
+							$location .= $rr['region'];
 						}
 						if(strlen($rr['country'])) {
 							if(strlen($details))
-								$details .= ', ';
-							$details .= $rr['country'];
+								$location .= ', ';
+							$location .= $rr['country'];
 						}
+
+						$age = '';
 						if(strlen($rr['birthday'])) {
 							if(($years = age($rr['birthday'],'UTC','')) != 0)
-								$details .= '<br />' . t('Age: ') . $years ; 
+								$age = $years;
 						}
 
 						$page_type = '';
@@ -231,7 +234,6 @@ function directory_content(&$a) {
 							|| (x($profile,'region') == 1)
 							|| (x($profile,'postcode') == 1)
 							|| (x($profile,'country') == 1))
-						$location = t('Location:');
 
 						$gender = ((x($profile,'gender') == 1) ? t('Gender: ') . $profile['gender']: False);
 	
@@ -240,9 +242,9 @@ function directory_content(&$a) {
 						$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage: ') : False);
 						$homepageurl = ((x($profile,'homepage') == 1) ?  $profile['homepage'] : ''); 
 
-						$hometown = ((x($profile,'hometown') == 1) ?  t('Hometown: ') . $profile['hometown']  : False);
+						$hometown = ((x($profile,'hometown') == 1) ? $profile['hometown']  : False);
 
-						$about = ((x($profile,'about') == 1) ?  t('About: ') . bbcode(strip_bbimage($profile['about'])) : False);
+						$about = ((x($profile,'about') == 1) ? bbcode(strip_bbimage($profile['about'])) : False);
 
 						$keywords = ((x($profile,'keywords')) ? $profile['keywords'] : '');
 
@@ -284,21 +286,27 @@ function directory_content(&$a) {
 							'hash' => $rr['hash'],
 							'alttext' => $rr['name'] . ((local_channel() || remote_channel()) ? ' ' . $rr['address'] : ''),
 							'name' => $rr['name'],
-							'details' => $pdesc . $details,
+							'details' => $details,
+							'age' => $age,
+							'age_label' => t('Age:'),
 							'profile' => $profile,
 							'address' =>  $rr['address'],
 							'nickname' => substr($rr['address'],0,strpos($rr['address'],'@')),
 							'location' => $location,
+							'location_label' => t('Location:'),
 							'gender'   => $gender,
 							'total_ratings' => $total_ratings,
 							'viewrate' => true,
 							'canrate' => ((local_channel()) ? true : false),
 							'pdesc'	=> $pdesc,
+							'pdesc_label' => t('Description:'),
 							'marital'  => $marital,
 							'homepage' => $homepage,
 							'homepageurl' => linkify($homepageurl),
 							'hometown' => $hometown,
+							'hometown_label' => t('Hometown:'),
 							'about' => $about,
+							'about_label' => t('About:'),
 							'conn_label' => t('Connect'),
 							'forum_label' => t('Public Forum:'), 
 							'connect' => $connect_link,
@@ -306,9 +314,10 @@ function directory_content(&$a) {
 							'kw' => (($out) ? t('Keywords: ') : ''),
 							'keywords' => $out,
 							'ignlink' => $suggest ? $a->get_baseurl() . '/directory?ignore=' . $rr['hash'] : '',
-							'ignore_label' => "Don't suggest",
+							'ignore_label' => t('Don\'t suggest'),
 							'common_friends' => (($common[$rr['address']]) ? intval($common[$rr['address']]) : ''),
-							'common_txt' => sprintf( t('Common connections: %s'), intval($common[$rr['address']]) ),
+							'common_label' => t('Common connections:'),
+							'common_count' => intval($common[$rr['address']]),
 							'safe' => $safe_mode
 						);
 
@@ -354,7 +363,7 @@ function directory_content(&$a) {
 						killme();
 					}
 					else {
-						$maxheight = 175;
+						$maxheight = 94;
 
 						$o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; divmore_height = " . intval($maxheight) . ";  </script>";
 						$o .= replace_macros($tpl, array(
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 7b149d744..d3831e589 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -1,76 +1,29 @@
-
-.directory-end {
-	clear: both;
-}
-.directory-name {
-	float: left;
-	width: 250px;
-}
-
-.directory-photo {
-	margin-left: 25px;
-}
 .directory-photo-img {
-	margin-left: auto;
-	margin-right: auto;
-	display:block;
 	width: 80px;
 	height: 80px;
-}
-.directory-details {
-	text-align: center;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-.directory-item {
-	overflow: hidden;
-	margin: 2px;
-	border-bottom: 2px solid #f1f1f1;
-	padding-bottom: 3px;
-}
-
-#directory-search-wrapper {
-	margin-top: 20px;
-	margin-right: 20px;
-	margin-bottom: 50px;
-}
-
-#directory-search-end {
-}
-
-.directory-photo-img {
 	border: none;
 }
 
-div.dirtagblock.widget {
-  overflow: hidden;
+.directory-item {
+	margin-bottom: 20px;
 }
 
-.dirpopup {
-	float: left;
-	width: 225px;
-}
-
-.contact-photo {
-	float: left;
-	margin-right: 16px;
-}
-
-.contact-name {
-	font-size: larger;
+.contact-photo-wrapper {
+	display: table-cell;
+	vertical-align: top;
 }
 
 .contact-info {
-	display: block;
-	overflow: hidden;
+	display: table-cell;
+	vertical-align: top;
+	padding-left: 10px;
 }
 
-.directory-item {
-	margin: 16px;
+.contact-info-label {
+	font-weight: bold;
 }
-.directory-connect {
-	margin-top: 3px;
-	display:block;
-	margin-left:auto;
-	margin-right: auto;
+
+.section-subtitle-wrapper .btn-xs {
+	margin-top: -2px;
 }
+
diff --git a/view/js/main.js b/view/js/main.js
index 625ac5b01..698e2d79c 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -615,7 +615,7 @@ function updateConvItems(mode,data) {
 
 
 function collapseHeight() {
-	$(".wall-item-body, .contact-info").each(function() {
+	$(".wall-item-body, .directory-collapse").each(function() {
 		var orgHeight = $(this).height();
 		if(orgHeight > divmore_height + 10) {
 			if(! $(this).hasClass('divmore')) {
diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js
index 90942f9ac..e850963c1 100644
--- a/view/js/mod_directory.js
+++ b/view/js/mod_directory.js
@@ -38,4 +38,4 @@ function postRatings() {
 
 $(document).ready(function() {
 	collapseHeight();
-});
\ No newline at end of file
+});
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 477df8a63..26739efc3 100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -1,16 +1,12 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$dirlbl}}</h1>
-
-{{if $search}}
-<h4>{{$finddsc}} {{$safetxt}}</h4> 
-{{/if}}
-
-{{foreach $entries as $entry}}
-{{include file="direntry.tpl"}}
-{{/foreach}}
-
-<div id="page-end"></div>
-<div class="directory-end"></div>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$dirlbl}}{{if $search}}:&nbsp;{{$safetxt}}{{/if}}</h2>
+	</div>
+	{{foreach $entries as $entry}}
+		{{include file="direntry.tpl"}}
+	{{/foreach}}
+	<div id="page-end"></div>
+	<div class="clear"></div>
 </div>
 <script>$(document).ready(function() { loadingPage = false;});</script>
 <div id="page-spinner"></div>
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 0608bca0a..3450ad36d 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -1,46 +1,73 @@
-<div class="directory-item lframe{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" >
+<div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" >
+	<div class="section-subtitle-wrapper">
+		<div class="pull-right">
+			{{if $entry.viewrate}}
+				{{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
+				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}}
+			{{/if}}
+			{{if $entry.ignlink}}
+			<a class="directory-ignore btn btn-warning btn-xs" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a>
+			{{/if}}
+			<a class="btn btn-success btn-xs" href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a>
+		</div>
+		<h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
+	</div>
+	<div class="section-content-wrapper directory-collapse">
+		<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" >
+			<div class="contact-photo" id="directory-photo-{{$entry.hash}}" >
+				<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" >
+					<img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" />
+				</a>
+			</div>
+		</div>
+		<div class="contact-info">
+			{{if $entry.common_friends}}
+			<div id="dir-common" class="contact-info-element">
+				<span class="contact-info-label">{{$entry.common_label}}</span> {{$entry.common_count}}
+			</div>
+			{{/if}}
 
-<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" >
-<div class="contact-photo" id="directory-photo-{{$entry.hash}}" >
-<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a>
-{{if $entry.connect}}
-<div class="directory-connect btn btn-default"><a href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a></div>
-{{/if}}
-{{if $entry.ignlink}}
-<div class="directory-ignore btn btn-default"><a href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a></div>
-{{/if}}
-</div>
-</div>
+			{{if $entry.pdesc}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.pdesc_label}}</span> {{$entry.pdesc}}
+			</div>
+			{{/if}}
 
-<div class='contact-info'>
-<div class="contact-name" id="directory-name-{{$entry.hash}}"  ><a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</div>
+			{{if $entry.age}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.age_label}}</span> {{$entry.age}}
+			</div>
+			{{/if}}
 
-{{if $entry.viewrate}}
-<div id="dir-rating-wrapper-{{$entry.hash}}" class="directory-rating" >{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}"><button class="btn btn-default">{{$entry.total_ratings}}</button></a>{{/if}}
-{{if $entry.canrate}}<button class="btn btn-default" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i></button><span class="required" id="edited-{{$entry.hash}}" style="display: none;" >*</span>{{/if}}
-</div>
-{{/if}}
-{{if $entry.common_friends}}
-<div id="dir-common">{{$entry.common_txt}}</div>
-{{/if}}
-{{if $entry.public_forum}}
-<div class="contact-forum">
-{{$entry.forum_label}} @{{$entry.nickname}}+
-</div>
-{{/if}}
+			{{if $entry.details}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.location}}</span> {{$entry.details}}
+			</div>
+			{{/if}}
 
-<div class="contact-details">{{$entry.details}}</div>
-{{if $entry.hometown}}
-<div class="directory-hometown">{{$entry.hometown}} </div>
-{{/if}}
-{{if $entry.about}}
-<div class="directory-about">{{$entry.about}} </div>
-{{/if}}
-{{if $entry.homepage}}
-<div class="directory-homepage">{{$entry.homepage}}{{$entry.homepageurl}} </div>
-{{/if}}
-{{if $entry.kw}}
-<div class="directory-keywords">{{$entry.kw}} {{$entry.keywords}}</div>
-{{/if}}
-</div>
+			{{if $entry.hometown}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.hometown_label}}</span> {{$entry.hometown}}
+			</div>
+			{{/if}}
+
+			{{if $entry.homepage}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.homepage}}</span> {{$entry.homepageurl}}
+			</div>
+			{{/if}}
+
+			{{if $entry.kw}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.kw}}</span> {{$entry.keywords}}
+			</div>
+			{{/if}}
+
+			{{if $entry.about}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$entry.about_label}}</span> {{$entry.about}}
+			</div>
+			{{/if}}
+		</div>
+	</div>
 </div>