diff --git a/core/um-actions-members.php b/core/um-actions-members.php
index 17d66763..8f369109 100644
--- a/core/um-actions-members.php
+++ b/core/um-actions-members.php
@@ -78,10 +78,10 @@
 	***	@pre-display members directory
 	***/
 	add_action('um_pre_directory_shortcode', 'um_pre_directory_shortcode');
-	function um_pre_directory_shortcode($args){
+	function um_pre_directory_shortcode($args) {
 		global $ultimatemember;
 		extract( $args );
-		
+
 		$ultimatemember->members->results = $ultimatemember->members->get_members( $args );
 
 	}
@@ -204,138 +204,22 @@
 		
 		?>
 		
-			<div class="um-members-none">
-				<p><?php echo $args['no_users']; ?></p>
-			</div>
+		<div class="um-members-none">
+			<p><?php echo $args['no_users']; ?></p>
+		</div>
 			
 		<?php
-		
+
 		}
 		
+		$file = um_path . 'templates/members-grid.php';
+		$theme_file = get_stylesheet_directory() . '/ultimate-member/templates/members-grid.php';
+		
+		if ( file_exists( $theme_file ) )
+			$file = $theme_file;
+
 		if ( um_members('users_per_page') ) {
-
-		?>
-		
-			<div class="um-members">
-			
-				<div class="um-gutter-sizer"></div>
-				
-				<?php $i = 0; foreach( um_members('users_per_page') as $member) { $i++; um_fetch_user( $member ); ?>
-			
-				<div class="um-member um-role-<?php echo um_user('role'); ?> <?php echo um_user('account_status'); ?> <?php if ($cover_photos) { echo 'with-cover'; } ?>">
-				
-					<span class="um-member-status <?php echo um_user('account_status'); ?>"><?php echo um_user('account_status_name'); ?></span>
-					
-					<?php if ($cover_photos) { 
-						
-						$sizes = um_get_option('cover_thumb_sizes');
-						
-						if ( $ultimatemember->mobile->isTablet() ) {
-							$cover_size = $sizes[1];
-						} else {
-							$cover_size = $sizes[0];
-						}
-						
-					?>
-					
-					<div class="um-member-cover" data-ratio="<?php echo um_get_option('profile_cover_ratio'); ?>">
-						<div class="um-member-cover-e"><a href="<?php echo um_user_profile_url(); ?>" title="<?php echo um_user('display_name'); ?>"><?php echo um_user('cover_photo', $cover_size); ?></a></div>
-					</div>
-					
-					<?php } ?>
-		
-					<?php if ($profile_photo) {
-						$default_size = str_replace( 'px', '', um_get_option('profile_photosize') );
-						$corner = um_get_option('profile_photocorner');
-						?>
-					<div class="um-member-photo radius-<?php echo $corner; ?>"><a href="<?php echo um_user_profile_url(); ?>" title="<?php echo um_user('display_name'); ?>"><?php echo get_avatar( um_user('ID'), $default_size ); ?></a></div>
-					<?php } ?>
-					
-					<div class="um-member-card <?php if (!$profile_photo) { echo 'no-photo'; } ?>">
-						
-						<?php if ( $show_name ) { ?>
-						<div class="um-member-name"><a href="<?php echo um_user_profile_url(); ?>" title="<?php echo um_user('display_name'); ?>"><?php echo um_user('display_name', 'html'); ?></a></div>
-						<?php } ?>
-						
-						<?php do_action('um_members_just_after_name', um_user('ID'), $args); ?>
-						
-						<?php do_action('um_members_after_user_name', um_user('ID'), $args); ?>
-						
-						<?php
-						if ( $show_tagline && is_array( $tagline_fields ) ) {
-							foreach( $tagline_fields as $key ) {
-								if ( $key && um_filtered_value( $key ) ) {
-									$value = um_filtered_value( $key );
-
-						?>
-						
-						<div class="um-member-tagline"><?php echo $value; ?></div>
-						
-						<?php
-								}
-							}
-						}
-						?>
-						
-						<?php if ( $show_userinfo ) { ?>
-						
-						<div class="um-member-meta-main">
-						
-							<?php if ( $userinfo_animate ) { ?>
-							<div class="um-member-more"><a href="#"><i class="um-faicon-angle-down"></i></a></div>
-							<?php } ?>
-							
-							<div class="um-member-meta <?php if ( !$userinfo_animate ) { echo 'no-animate'; } ?>">
-							
-								<?php foreach( $reveal_fields as $key ) {
-										if ( $key && um_filtered_value( $key ) ) {
-											$value = um_filtered_value( $key );
-											
-								?>
-								
-								<div class="um-member-metaline um-member-metaline-<?php echo $key; ?>"><span><strong><?php echo $ultimatemember->fields->get_label( $key ); ?>:</strong> <?php echo $value; ?></span></div>
-								
-								<?php 
-									}
-								} 
-								?>
-								
-								<?php if ( $show_social ) { ?>
-								<div class="um-member-connect">
-								
-									<?php $ultimatemember->fields->show_social_urls(); ?>
-
-								</div>
-								<?php } ?>
-								
-							</div>
-
-							<div class="um-member-less"><a href="#"><i class="um-faicon-angle-up"></i></a></div>
-						
-						</div>
-						
-						<?php } ?>
-						
-					</div>
-					
-				</div>
-				
-				<?php 
-				
-					um_reset_user_clean();
-				
-				} // end foreach
-				
-				um_reset_user();
-				
-				?>
-				
-				<div class="um-clear"></div>
-				
-			</div>
-			
-		<?php
-		
+			include_once $file;
 		}
 
 	}
\ No newline at end of file
diff --git a/templates/members-grid.php b/templates/members-grid.php
new file mode 100644
index 00000000..7701b441
--- /dev/null
+++ b/templates/members-grid.php
@@ -0,0 +1,118 @@
+		
+			<div class="um-members">
+			
+				<div class="um-gutter-sizer"></div>
+				
+				<?php $i = 0; foreach( um_members('users_per_page') as $member) { $i++; um_fetch_user( $member ); ?>
+			
+				<div class="um-member um-role-<?php echo um_user('role'); ?> <?php echo um_user('account_status'); ?> <?php if ($cover_photos) { echo 'with-cover'; } ?>">
+				
+					<span class="um-member-status <?php echo um_user('account_status'); ?>"><?php echo um_user('account_status_name'); ?></span>
+					
+					<?php if ($cover_photos) { 
+						
+						$sizes = um_get_option('cover_thumb_sizes');
+						
+						if ( $ultimatemember->mobile->isTablet() ) {
+							$cover_size = $sizes[1];
+						} else {
+							$cover_size = $sizes[0];
+						}
+						
+					?>
+					
+					<div class="um-member-cover" data-ratio="<?php echo um_get_option('profile_cover_ratio'); ?>">
+						<div class="um-member-cover-e"><a href="<?php echo um_user_profile_url(); ?>" title="<?php echo um_user('display_name'); ?>"><?php echo um_user('cover_photo', $cover_size); ?></a></div>
+					</div>
+					
+					<?php } ?>
+		
+					<?php if ($profile_photo) {
+						$default_size = str_replace( 'px', '', um_get_option('profile_photosize') );
+						$corner = um_get_option('profile_photocorner');
+						?>
+					<div class="um-member-photo radius-<?php echo $corner; ?>"><a href="<?php echo um_user_profile_url(); ?>" title="<?php echo um_user('display_name'); ?>"><?php echo get_avatar( um_user('ID'), $default_size ); ?></a></div>
+					<?php } ?>
+					
+					<div class="um-member-card <?php if (!$profile_photo) { echo 'no-photo'; } ?>">
+						
+						<?php if ( $show_name ) { ?>
+						<div class="um-member-name"><a href="<?php echo um_user_profile_url(); ?>" title="<?php echo um_user('display_name'); ?>"><?php echo um_user('display_name', 'html'); ?></a></div>
+						<?php } ?>
+						
+						<?php do_action('um_members_just_after_name', um_user('ID'), $args); ?>
+						
+						<?php do_action('um_members_after_user_name', um_user('ID'), $args); ?>
+						
+						<?php
+						if ( $show_tagline && is_array( $tagline_fields ) ) {
+							foreach( $tagline_fields as $key ) {
+								if ( $key && um_filtered_value( $key ) ) {
+									$value = um_filtered_value( $key );
+
+						?>
+						
+						<div class="um-member-tagline"><?php echo $value; ?></div>
+						
+						<?php
+								}
+							}
+						}
+						?>
+						
+						<?php if ( $show_userinfo ) { ?>
+						
+						<div class="um-member-meta-main">
+						
+							<?php if ( $userinfo_animate ) { ?>
+							<div class="um-member-more"><a href="#"><i class="um-faicon-angle-down"></i></a></div>
+							<?php } ?>
+							
+							<div class="um-member-meta <?php if ( !$userinfo_animate ) { echo 'no-animate'; } ?>">
+							
+								<?php foreach( $reveal_fields as $key ) {
+										if ( $key && um_filtered_value( $key ) ) {
+											$value = um_filtered_value( $key );
+											
+								?>
+								
+								<div class="um-member-metaline um-member-metaline-<?php echo $key; ?>"><span><strong><?php echo $ultimatemember->fields->get_label( $key ); ?>:</strong> <?php echo $value; ?></span></div>
+								
+								<?php 
+									}
+								} 
+								?>
+								
+								<?php if ( $show_social ) { ?>
+								<div class="um-member-connect">
+								
+									<?php $ultimatemember->fields->show_social_urls(); ?>
+
+								</div>
+								<?php } ?>
+								
+							</div>
+
+							<div class="um-member-less"><a href="#"><i class="um-faicon-angle-up"></i></a></div>
+						
+						</div>
+						
+						<?php } ?>
+						
+					</div>
+					
+				</div>
+				
+				<?php 
+				
+					um_reset_user_clean();
+				
+				} // end foreach
+				
+				um_reset_user();
+				
+				?>
+				
+				<div class="um-clear"></div>
+				
+			</div>
\ No newline at end of file