diff --git a/admin/templates/directory/appearance.php b/admin/templates/directory/appearance.php
index a769ab7c..3fecf369 100644
--- a/admin/templates/directory/appearance.php
+++ b/admin/templates/directory/appearance.php
@@ -1,11 +1,11 @@
 <div class="um-admin-metabox">
 
-	<p><label for="_um_template"><?php _e('Template','ultimatemember'); ?></label>
-		<select name="_um_template" id="_um_template" class="umaf-selectjs" style="width: 100%">
+	<p><label for="_um_directory_template"><?php _e('Template','ultimatemember'); ?></label>
+		<select name="_um_directory_template" id="_um_directory_template" class="umaf-selectjs" style="width: 100%">
 
 			<?php foreach($ultimatemember->shortcodes->get_templates( 'members' ) as $key => $value) { ?>
 			
-			<option value="<?php echo $key; ?>" <?php selected($key, $ultimatemember->query->get_meta_value('_um_template' ) ); ?>><?php echo $value; ?></option>
+			<option value="<?php echo $key; ?>" <?php selected($key, $ultimatemember->query->get_meta_value('_um_directory_template', null, um_get_option('directory_template') ) ); ?>><?php echo $value; ?></option>
 			
 			<?php } ?>
 			
diff --git a/assets/css/um-account.css b/assets/css/um-account.css
index 8a4d5516..594a281c 100644
--- a/assets/css/um-account.css
+++ b/assets/css/um-account.css
@@ -1,26 +1,33 @@
 /*
-	- sidebar in account page
+	- Layout
 */
 
+.um-account a:focus {
+    outline: 0 !important; /*removes the dotted border*/
+}
+
 .um-account-side {
 	float: left;
 	width: 35%;
-	padding: 15px;
-	border-right: solid 2px #eee;
+	padding: 0 30px;
 	box-sizing: border-box;
 }
 
-/*
-	- account main
-*/
-
 .um-account-main {
 	float: left;
 	width: 50%;
-	padding: 0 30px !important;
+	padding: 0 30px;
 	box-sizing: border-box;
 }
 
+.um-account-tab {
+	display: none;
+}
+
+/*
+	- Main tab
+*/
+
 .um-account-main div.um-field {
 	padding-top: 25px;
 }
@@ -50,20 +57,12 @@
 }
 
 /*
-	- account tab
-*/
-
-.um-account-tab {
-	display: none;
-}
-
-/*
-	- account page photo
+	- Account photo
 */
 
 .um-account-meta {
 	text-align: center;
-	margin-bottom: 15px;
+	margin-bottom: 20px;
 }
 
 .um-account-meta img {
@@ -74,13 +73,49 @@
 	font-weight: bold;
 	color: #333;
 	text-decoration: none !important;
-	font-size: 16px;
+	font-size: 18px;
 }
 
 .um-account-name a:hover {color: #3ba1da}
 
 /*
-	- tabs
+	- Account nav
+*/
+
+.um-account-nav a {
+	display: block;
+	height: 44px;
+	line-height: 44px;
+	color: #666;
+	text-decoration: none !important;
+	position: relative;
+	padding-left: 40px;
+	border-bottom: 1px solid #eee;
+	transition: all .2s linear;
+	font-size: 14px;
+}
+
+.um-account-nav a.current{
+	color: #3ba1da !important;
+	font-weight: bold;
+}
+
+.um-account-nav span.arr {
+	position: absolute;
+	right: 0;
+	top: 4px;
+	font-size: 23px;
+}
+
+.um-account-nav span.ico {
+	position: absolute;
+	left: 0;
+	top: 3px;
+	font-size: 21px;
+}
+
+/*
+	- Account tabs
 */
 
 .um-account-side ul, .um-account-side li {
@@ -91,17 +126,13 @@
 
 .um-account-side li {margin-bottom: 6px !important;background: #eee;}
 
-.um-account-side li a:focus{
-    outline:0; /*removes the dotted border*/
-}
-
 .um-account-side li a{
 	display: block;
 	padding: 4px 0px;
 	font-size: 14px;
+	height: 30px;
 	line-height: 20px;
 	color: #999;
-	height: 30px;
 	position: relative;
 }
 
diff --git a/assets/css/um-members.css b/assets/css/um-members.css
index 74d09c8b..ffaeb7fd 100644
--- a/assets/css/um-members.css
+++ b/assets/css/um-members.css
@@ -65,8 +65,15 @@
 	margin: 0 0 10px 0 !important;
 }
 
-.um-search.um-search-1 .um-search-filter {width: 100%;padding: 0 0 10px 0;}
-.um-search.um-search-2 .um-search-filter {width: 50%}
+.um-search.um-search-1 .um-search-filter {
+	width: 100%;
+	padding: 0 0 10px 0;
+	float: none;
+}
+
+.um-search.um-search-2 .um-search-filter {
+	width: 50%;
+}
 
 .um-search-filter {
 	padding: 0 15px 30px 15px;
@@ -88,6 +95,10 @@
 	- Member box
 */
 
+.um-members {
+
+}
+
 .um-member {
 	float: left;
 	width: 30%;
@@ -101,28 +112,15 @@
 .um-gutter-sizer { width: 5% }
 
 .um-member-cover {
-	background: #eee;
-    display: inline-block;
-    position: relative;
-    width: 100%;
-}
-
-.um-member-cover-d {
-    margin-top: 37.1%;
+	background-color: #eee;
 }
 
 .um-member-cover-e {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    background-color: #eee;
+	text-align: center;
+	box-sizing: border-box;
 }
 
-.um-member-cover-e img {
-	width: 100% !important;
-}
+.um-member-cover-e img {width: 100% !important;}
 
 /*
 	- Member photo
@@ -138,17 +136,18 @@
 .um-member-photo img {
 	display: inline !important;
 	border-radius: 999px !important;
-	border: 1px solid #ccc;
+	border: 5px solid #fff;
+	background: #fff;
 	width: 140px;
 	height: 140px;
 }
 
 .um-member.with-cover .um-member-photo {padding-top: 0}
 .um-member.with-cover .um-member-photo img {
-	width: 90px;
-	height: 90px;
+	width: 100px;
+	height: 100px;
 	position: relative;
-	top: -45px;
+	top: -35px;
 	margin-bottom: -45px !important;
 }
 
@@ -316,26 +315,26 @@
 	- Members pagination
 */
 
-.um-members-pagi {
+.um-members-pagi,
+.um-members-pagidrop
+{
 	text-align: center;
-	margin-top: 20px;
-	padding-top: 40px;
-	padding-bottom: 5px;
-	border-top: 1px solid #eee;
+	padding: 5px 0;
+	font-size: 15px;
 }
 
-
 .um-members-pagi span.current,
 .um-members-pagi span.current:hover {
 	background: #3ba1da;
-	border-color: #3ba1da;
 	color: #fff;
 }
 
 .um-members-pagi i:before {font-size: 20px;vertical-align: middle !important;height: 34px;line-height: 34px;top: -2px;position: relative;}
 
 .um-members-pagi span.disabled {opacity: .4;cursor: default}
-.um-members-pagi span.none {border: 0;color: #aaa}
+
+.um-members-pagi span.none {color: #aaa}
+
 .um-members-pagi span {cursor: default}
 .um-members-pagi span,
 .um-members-pagi a {
@@ -343,7 +342,6 @@
 	width: auto;
 	height: 34px;
 	line-height: 34px;
-	font-size: 15px;
 	transition: all .2s linear;
 	padding: 0px 14px;
 	color: #666;
@@ -352,5 +350,4 @@
 .um-members-pagi a:hover {
 	text-decoration: none !important;
 	color: #3ba1da;
-	border-color: #3ba1da;
 }
\ No newline at end of file
diff --git a/assets/css/um-responsive.css b/assets/css/um-responsive.css
index 3696a240..d4e00844 100644
--- a/assets/css/um-responsive.css
+++ b/assets/css/um-responsive.css
@@ -1,3 +1,24 @@
+.uimob500-show,
+.uimob800-show,
+.uimob960-show
+{
+	display: none;
+}
+
+div.uimob500 .uimob500-show,
+div.uimob800 .uimob800-show,
+div.uimob960 .uimob960-show
+{
+	display: block;
+}
+
+div.uimob500 .uimob500-hide,
+div.uimob800 .uimob800-hide,
+div.uimob960 .uimob960-hide
+{
+	display: none;
+}
+
 /**
 	for 500px and below
 **/
@@ -64,8 +85,166 @@ div.uimob500 .um-col-133 {
 	margin: 0;
 }
 
-div.uimob500 .um-col-alt .um-half {
+div.uimob500 .um-field-half {
+	float: none;
 	width: 100%;
+}
+
+div.uimob500 .um-search {
+	padding: 20px 0 !important;
+	width: 100% !important;
+	box-sizing: border-box;
+}
+
+div.uimob500 .um-search .um-search-filter {
+	width: 100% !important;
 	float: none !important;
-	margin-bottom: 10px;
-}
\ No newline at end of file
+	padding: 0 0 15px 0 !important;
+}
+
+div.uimob500 .um-search .um-search-submit .um-button {
+	display: block !important;
+	min-width: 100% !important;
+	margin: 0 0 15px 0 !important;
+}
+
+div.uimob500 .um-member {
+	width: 100%;
+}
+
+div.uimob500  .um-gutter-sizer { width: 0px }
+
+div.uimob500 .um-account-main {
+	float: none;
+	width: 100%;
+	padding: 0;
+	box-sizing: border-box;
+}
+
+div.uimob500 .um-account-tab {
+	padding-bottom: 20px;
+	border-bottom: 1px solid #eee;
+}
+
+div.uimob500 .um-account-main div.um-field {padding-top: 15px}
+
+div.uimob500 .um-account-meta {
+	margin-bottom: 0;
+}
+
+/**
+	for 800px and below
+**/
+
+div.uimob800 .um-account-main {
+	width: 90%;
+	max-width: 450px;
+}
+
+div.uimob800 .um-account-side {
+	padding: 0;
+	width: 10%;
+}
+
+div.uimob800 .um-account-side ul {
+	border: 1px solid #ddd;
+	border-radius: 3px;
+}
+
+div.uimob800 .um-account-side li {margin-bottom: 0 !important;background: transparent;}
+
+div.uimob800 .um-account-side li a{
+	display: block;
+	padding: 0 !important;
+	height: 44px;
+	line-height: 44px;
+	color: #666 !important;
+	text-align: center;
+	text-decoration: none !important;
+	background: transparent;
+	transition: all .2s linear;
+}
+div.uimob800 .um-account-side li:first-child a {border-radius: 3px 3px 0 0 }
+div.uimob800 .um-account-side li:last-child a {border-radius: 0 0 3px 3px}
+
+div.uimob800 .um-account-side li a span.um-account-icontip {
+	display: block;
+	float: left;
+	text-align: center;
+	width: 100%;
+	height: 100%;
+	font-size: 22px;
+	line-height: 44px;
+}
+
+div.uimob800 .um-account-side li a span.um-account-icontip i {
+	position: relative;
+	top: 4px;
+	text-align: center;
+	width: 100%;
+}
+
+div.uimob800 .um-account-side li a.current,
+div.uimob800 .um-account-side li a.current:hover {
+	background: #3ba1da !important;
+	color: #fff !important;
+}
+
+div.uimob800 .um-account-meta a {
+	border: 1px solid #ddd;
+}
+
+div.uimob800 .um-account-meta a,
+div.uimob800 .um-account-meta img {
+	display: block;
+	overflow: hidden;
+	border-radius: 3px;
+}
+
+/********************************************/
+
+/**
+	for 960px and below
+**/
+
+/********************************************/
+
+div.uimob960 .um-col-131,
+div.uimob960 .um-col-132,
+div.uimob960 .um-col-133 {
+	float: none;
+	width: 100%;
+	margin: 0;
+}
+
+div.uimob960 .um-search {
+	padding: 20px 0 !important;
+	width: 100% !important;
+	box-sizing: border-box;
+}
+
+div.uimob960 .um-search .um-search-filter {
+	width: 48% !important;
+	float: left !important;
+	padding: 0 0 15px 0 !important;
+}
+
+div.uimob960 .um-search .um-search-filter-2 {
+	margin-left: 4%;
+}
+
+div.uimob960 .um-search .um-search-submit .um-button {
+	display: block !important;
+	width: 48% !important;
+	margin: 0 0 15px 0 !important;
+	box-sizing: border-box;
+	float: left;
+}
+
+div.uimob960 .um-search .um-search-submit .um-button.um-alt {float: right}
+
+div.uimob960 .um-member {
+	width: 48%;
+}
+
+div.uimob960  .um-gutter-sizer { width: 4% }
\ No newline at end of file
diff --git a/assets/css/um-styles.css b/assets/css/um-styles.css
index a4bddaf0..1c8fcb33 100644
--- a/assets/css/um-styles.css
+++ b/assets/css/um-styles.css
@@ -12,6 +12,7 @@
 	margin-bottom: 30px !important;
 	-webkit-font-smoothing: antialiased !important;
 	-moz-osx-font-smoothing: grayscale !important;
+	opacity: 0;
 }
 
 .um-s1,
@@ -169,15 +170,11 @@
 .um-tip {
 	margin: 0 0 0 8px;
 	cursor: pointer;
-	height: 22px;
-	line-height: 22px;
 	display: inline-block;
 }
 
 .um-tip i {
-	font-size: 20px;
-	height: 22px;
-	line-height: 22px;
+	font-size: 18px;
 	vertical-align: middle;
 }
 
diff --git a/assets/js/um-account.js b/assets/js/um-account.js
index 38675d93..f9958018 100644
--- a/assets/js/um-account.js
+++ b/assets/js/um-account.js
@@ -1,9 +1,12 @@
 jQuery(document).ready(function() {
 
-	var account_ = jQuery('.um-account-main').attr('data-current_tab');
+	var current_tab = jQuery('.um-account-main').attr('data-current_tab');
 	
-	jQuery('.um-account-tab[data-tab='+account_+']').show();
+	if  ( current_tab ) {
+		jQuery('.um-account-tab[data-tab='+current_tab+']').show();
+	}
 
+	/* Switching tab non-mobile */
 	jQuery(document).on('click','.um-account-side li a',function(e){
 		e.preventDefault();
 		var link = jQuery(this);
@@ -17,9 +20,37 @@ jQuery(document).ready(function() {
 		window.history.pushState("", "", url_);
 		
 		jQuery('.um-account-tab').hide();
-		jQuery('.um-account-tab[data-tab='+tab_+']').show();
+		jQuery('.um-account-tab[data-tab='+tab_+']').fadeIn();
+		
+		jQuery('.um-account-nav a').removeClass('current');
+		jQuery('.um-account-nav a[data-tab='+tab_+']').addClass('current');
 		
 		return false;
 	});
 	
+	/* Switching tab mobile */
+	jQuery(document).on('click','.um-account-nav a',function(e){
+		e.preventDefault();
+		
+		var tab_ = jQuery(this).attr('data-tab');
+		var div = jQuery(this).parents('div');
+		var link = jQuery(this);
+		
+		jQuery('.um-account-tab').hide();
+		
+		if ( link.hasClass('current') ) {
+			div.next('.um-account-tab').slideUp();
+			link.removeClass('current');
+		} else {
+			div.next('.um-account-tab').slideDown();
+			link.parents('div').find('a').removeClass('current');
+			link.addClass('current');
+		}
+
+		jQuery('.um-account-side li a').removeClass('current');
+		jQuery('.um-account-side li a[data-tab='+tab_+']').addClass('current');
+
+		return false;
+	});
+	
 });
\ No newline at end of file
diff --git a/assets/js/um-members.js b/assets/js/um-members.js
index d2f254cb..1edb4892 100644
--- a/assets/js/um-members.js
+++ b/assets/js/um-members.js
@@ -11,7 +11,7 @@ jQuery(document).ready(function() {
 
 	/* Members wall JS */
 	jQuery('.um-members').each(function(){
-	UM_Member_Grid( jQuery(this) );
+		UM_Member_Grid( jQuery(this) );
 	});
 	
 	/* load member's meta */
diff --git a/assets/js/um-responsive.js b/assets/js/um-responsive.js
index 4c63f5b6..534b4ecc 100644
--- a/assets/js/um-responsive.js
+++ b/assets/js/um-responsive.js
@@ -9,21 +9,44 @@ function um_responsive(){
 		
 			jQuery(this).removeClass('uimob500');
 			jQuery(this).removeClass('uimob800');
+			jQuery(this).removeClass('uimob960');
+			
 			jQuery(this).addClass('uimob500');
 
 		} else if ( element_width <= 800 ) {
 			
 			jQuery(this).removeClass('uimob500');
 			jQuery(this).removeClass('uimob800');
+			jQuery(this).removeClass('uimob960');
+			
 			jQuery(this).addClass('uimob800');
 
-		} else if ( element_width > 800 ) {
+		} else if ( element_width <= 960 ) {
+			
+			jQuery(this).removeClass('uimob500');
+			jQuery(this).removeClass('uimob800');
+			jQuery(this).removeClass('uimob960');
+			
+			jQuery(this).addClass('uimob960');
+
+		} else if ( element_width > 960 ) {
 		
 			jQuery(this).removeClass('uimob500');
 			jQuery(this).removeClass('uimob800');
-			
+			jQuery(this).removeClass('uimob960');
+
 		}
 
+		jQuery('.um-members').each(function(){
+			UM_Member_Grid( jQuery(this) );
+		});
+		
+		if (  jQuery('.um-account-nav').length > 0 && jQuery('.um-account-side').is(':visible') && jQuery('.um-account-tab:visible').length == 0 ) {
+			jQuery('.um-account-side li a.current').trigger('click');
+		}
+		
+		jQuery(this).css('opacity',1);
+	
 	});
 	
 }
diff --git a/assets/js/um-scripts.js b/assets/js/um-scripts.js
index 9e0dd5be..7c368d5f 100644
--- a/assets/js/um-scripts.js
+++ b/assets/js/um-scripts.js
@@ -5,7 +5,7 @@ jQuery(document).ready(function() {
 	jQuery('.um-tip-w').tipsy({gravity: 'w', opacity: 1, live: true, offset: 3 });
 	jQuery('.um-tip-e').tipsy({gravity: 'e', opacity: 1, live: true, offset: 3 });
 	jQuery('.um-tip-s').tipsy({gravity: 's', opacity: 1, live: true, offset: 3 });
-
+		
 	/* Custom Radio Buttons */
 	jQuery('.um-field-radio').mouseenter(function(){
 		if (!jQuery(this).hasClass('active')) {
diff --git a/core/um-actions-account.php b/core/um-actions-account.php
index 3cacac8b..e6f3e3de 100644
--- a/core/um-actions-account.php
+++ b/core/um-actions-account.php
@@ -125,7 +125,7 @@
 		extract( $info );
 		$fields = $ultimatemember->builtin->get_specific_fields('single_user_password'); ?>
 		
-		<div class="um-account-heading"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
+		<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
 		
 		<?php echo wpautop( um_get_option('delete_account_text') ); ?>
 		
@@ -149,7 +149,7 @@
 		extract( $info );
 		$fields = $ultimatemember->builtin->get_specific_fields('profile_privacy,show_in_members'); ?>
 		
-		<div class="um-account-heading"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
+		<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
 		
 		<?php $output = null;
 		foreach( $fields as $key => $data ) {
@@ -171,7 +171,7 @@
 		extract( $info );
 		$fields = $ultimatemember->builtin->get_specific_fields('user_login,first_name,last_name,user_email'); ?>
 		
-		<div class="um-account-heading"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
+		<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
 		
 		<?php $output = null;
 		foreach( $fields as $key => $data ) {
@@ -193,7 +193,7 @@
 		extract( $info );
 		$fields = $ultimatemember->builtin->get_specific_fields('user_password'); ?>
 		
-		<div class="um-account-heading"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
+		<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
 		
 		<?php $output = null;
 		foreach( $fields as $key => $data ) {
@@ -206,7 +206,29 @@
 	}
 	
 	/***
-	***	@display account page tabs
+	***	@display account photo and username
+	***/
+	add_action('um_account_user_photo_hook__mobile', 'um_account_user_photo_hook__mobile');
+	function um_account_user_photo_hook__mobile( $args ) {
+		global $ultimatemember;
+		extract( $args );
+		
+		?>
+		
+		<div class="um-account-meta uimob500-show">
+			
+			<div class="um-account-meta-img"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
+			
+			<div class="um-account-name"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('display_name'); ?></a></div>
+		
+		</div>
+	
+		<?php
+		
+	}
+	
+	/***
+	***	@display account photo and username
 	***/
 	add_action('um_account_user_photo_hook', 'um_account_user_photo_hook');
 	function um_account_user_photo_hook( $args ) {
@@ -217,9 +239,11 @@
 		
 		<div class="um-account-meta">
 			
-			<div class="um-account-meta-img"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 80); ?></a></div>
+			<div class="um-account-meta-img uimob800-hide"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
 			
-			<div class="um-account-name"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('display_name'); ?></a></div>
+			<div class="um-account-meta-img-b uimob800-show um-tip-w" title="<?php echo um_user('display_name'); ?>"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
+			
+			<div class="um-account-name uimob800-hide"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('display_name'); ?></a></div>
 		
 		</div>
 	
@@ -267,9 +291,10 @@
 				
 				<li>
 					<a data-tab="<?php echo $id; ?>" href="<?php echo $ultimatemember->account->tab_link($id); ?>" class="um-account-link <?php if ( $id == $current_tab ) echo 'current'; ?>">
-						<span class="um-account-icon"><i class="<?php echo $icon; ?>"></i></span>
-						<span class="um-account-title"><?php echo $title; ?></span>
-						<span class="um-account-arrow"><i class="um-icon-right-open"></i></span>
+						<span class="um-account-icontip uimob800-show um-tip-w" title="<?php echo $title; ?>"><i class="<?php echo $icon; ?>"></i></span>
+						<span class="um-account-icon uimob800-hide"><i class="<?php echo $icon; ?>"></i></span>
+						<span class="um-account-title uimob800-hide"><?php echo $title; ?></span>
+						<span class="um-account-arrow uimob800-hide"><i class="um-icon-right-open"></i></span>
 					</a>
 				</li>
 				
diff --git a/core/um-actions-members.php b/core/um-actions-members.php
index c83600df..43540b93 100644
--- a/core/um-actions-members.php
+++ b/core/um-actions-members.php
@@ -31,9 +31,18 @@
 				
 					<?php
 
-					$i = 0; foreach( $search_filters as $filter ) { $i++;
-						echo '<div class="um-search-filter">'; $ultimatemember->members->show_filter( $filter ); echo '</div>';
-						if ( $i % 3 == 0 ) { echo '<div class="um-clear"></div>'; }
+					$i = 0;
+					foreach( $search_filters as $filter ) {
+					$i++;
+						
+						if ( $i % 2 == 0 ) {
+							$add_class = 'um-search-filter-2';
+						} else {
+							$add_class = '';
+						}
+						
+						echo '<div class="um-search-filter '. $add_class .'">'; $ultimatemember->members->show_filter( $filter ); echo '</div>';
+					
 					}
 					
 					?>
@@ -46,7 +55,7 @@
 						
 						<a href="#" class="um-button um-do-search"><?php _e('Search','ultimatemember'); ?></a><a href="<?php echo $ultimatemember->permalinks->get_current_url( true ); ?>" class="um-button um-alt"><?php _e('Reset','ultimatemember'); ?></a>
 						
-					</div>
+					</div><div class="um-clear"></div>
 				
 				</form>
 			
@@ -100,8 +109,20 @@
 		if ( um_members('total_pages') > 1 ) { // needs pagination
 		
 		?>
-	
-		<div class="um-members-pagi">
+		
+		<div class="um-members-pagidrop uimob500-show">
+			
+			<?php _e('Jump to page:','ultimatemember'); ?>
+			
+			<select onChange="window.location.href=this.value" class="um-s1" style="width: 100px">
+				<?php foreach( um_members('pages_to_show') as $i ) { ?>
+				<option value="<?php echo $ultimatemember->permalinks->add_query( 'members_page', $i ); ?>" <?php selected($i, um_members('page')); ?>><?php printf(__('%s of %d','ultimatemember'), $i, um_members('total_pages') ); ?></option>
+				<?php } ?>
+			</select>
+		
+		</div>
+		
+		<div class="um-members-pagi uimob500-hide">
 		
 			<?php if ( um_members('page') != 1 ) { ?>
 			<a href="<?php echo $ultimatemember->permalinks->add_query( 'members_page', 1 ); ?>" class="pagi pagi-arrow um-tip-n" title="First Page"><i class="um-icon-angle-double-left"></i></a>
@@ -182,7 +203,6 @@
 				
 					<?php if ($cover_photos) { ?>
 					<div class="um-member-cover">
-						<div class="um-member-cover-d"></div>
 						<div class="um-member-cover-e"><?php echo um_user('cover_photo'); ?></div>
 					</div>
 					<?php } ?>
diff --git a/core/um-fields.php b/core/um-fields.php
index a2d6c8f5..fa9c9653 100644
--- a/core/um-fields.php
+++ b/core/um-fields.php
@@ -227,7 +227,7 @@ class UM_Fields {
 		
 		$output .= '<label for="'.$key.$ultimatemember->form->form_suffix.'">'.$label.'</label>';
 		
-		if ( isset( $data['help'] ) && $this->viewing == false ) {$output .= '<span class="um-tip um-tip-w" title="'.$data['help'].'"><i class="um-icon-help-circled"></i></span>';}
+		if ( isset( $data['help'] ) && $this->viewing == false ) {$output .= '<span class="um-tip um-tip-s" title="'.$data['help'].'"><i class="um-icon-help-circled"></i></span>';}
 		
 		$output .= '<div class="um-clear"></div></div>';
 		
@@ -1026,8 +1026,10 @@ class UM_Fields {
 						} else {
 							$class = 'um-s1';
 						}
-						
+							
+						if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label($label, $key, $data);
+						}
 
 						$output .= '<div class="um-field-area">';
 						
@@ -1078,7 +1080,9 @@ class UM_Fields {
 							$class = 'um-s1';
 						}
 						
+						if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label($label, $key, $data);
+						}
 
 						$output .= '<div class="um-field-area">';
 						
@@ -1123,7 +1127,9 @@ class UM_Fields {
 			case 'radio':
 				$output .= '<div class="um-field' . $classes . '"' . $conditional . ' data-key="'.$key.'">';
 						
+						if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label($label, $key, $data);
+						}
 						
 						$output .= '<div class="um-field-area">';
 							
diff --git a/core/um-filters-members.php b/core/um-filters-members.php
index e77e325d..f9a170dd 100644
--- a/core/um-filters-members.php
+++ b/core/um-filters-members.php
@@ -132,11 +132,6 @@
 		if ( count ($query_args['meta_query']) == 1 ) {
 			unset( $query_args['meta_query'] );
 		}
-		
-		if ( $query_args['orderby'] == 'user_registered' && $query_args['order'] == 'DESC' ) {
-			unset( $query_args['orderby'] );
-			unset( $query_args['order'] );
-		}
 
 		return $query_args;
 		
diff --git a/core/um-setup.php b/core/um-setup.php
index 24d71593..57b5d059 100644
--- a/core/um-setup.php
+++ b/core/um-setup.php
@@ -135,6 +135,7 @@ class UM_Setup {
 			'_um_login_secondary_btn_color' => '#eee',
 			'_um_login_secondary_btn_hover' => '#e5e5e5',
 			'_um_login_secondary_btn_text' => '#666',
+			'_um_directory_template' => 'members',
 			'_um_directory_header' => __('{total_users} Members','ultimatemember'),
 			'_um_directory_no_users' => __('We are sorry. We cannot find any users who match your search criteria.','ultimatemember'),
 		);
diff --git a/templates/account.php b/templates/account.php
index ec3c8494..48eafaed 100644
--- a/templates/account.php
+++ b/templates/account.php
@@ -6,7 +6,9 @@
 			
 			<?php do_action('um_account_page_hidden_fields', $args ); ?>
 			
-			<div class="um-account-side">
+			<?php do_action('um_account_user_photo_hook__mobile', $args ); ?>
+			
+			<div class="um-account-side uimob500-hide">
 			
 				<?php do_action('um_account_user_photo_hook', $args ); ?>
 				
@@ -22,10 +24,23 @@
 				
 					foreach( $arr as $id => $info ) { extract( $info );
 					
+						$current_tab = $ultimatemember->account->current_tab;
+						
 						if ( um_get_option('account_tab_'.$id ) == 1 || $id == 'general' ) {
 					
+							?>
+							
+							<div class="um-account-nav uimob500-show"><a href="#" data-tab="<?php echo $id; ?>" class="<?php if ( $id == $current_tab ) echo 'current'; ?>"><?php echo $title; ?>
+								<span class="ico"><i class="<?php echo $icon; ?>"></i></span>
+								<span class="arr"><i class="um-icon-chevron-down-3"></i></span>
+							</a></div>
+							
+							<?php
+							
 							echo '<div class="um-account-tab um-account-tab-'.$id.'" data-tab="'.$id.'">';
-							do_action("um_account_tab__{$id}", $info );
+
+								do_action("um_account_tab__{$id}", $info );
+							
 							echo '</div>';
 						
 						}
diff --git a/um-config.php b/um-config.php
index a6a52914..9408dd0b 100644
--- a/um-config.php
+++ b/um-config.php
@@ -1272,4 +1272,24 @@ $this->sections[] = array(
 		
 	)
 	
+);
+
+$this->sections[] = array(
+	
+    'subsection' => true,
+    'title'      => __( 'Member Directory'),
+    'fields'     => array(
+		
+		array(
+				'id'       		=> 'directory_template',
+                'type'     		=> 'select',
+				'select2'		=> array( 'allowClear' => 0, 'minimumResultsForSearch' => -1 ),
+                'title'    		=> __( 'Members Default Template' ),
+                'desc' 	   		=> __( 'This will be the default template to output member directory' ),
+                'default'  		=> um_get_metadefault('directory_template'),
+				'options' 		=> $ultimatemember->shortcodes->get_templates( 'members' ),
+        ),
+		
+	)
+	
 );
\ No newline at end of file