diff --git a/content-az.php b/content-az.php
index 6a7f35c..6206387 100644
--- a/content-az.php
+++ b/content-az.php
@@ -27,8 +27,9 @@ $pattern = '#[A-Za-z|~`!@\#$%^&*()_+=|\\}\][{\'/;\-":?>.<]#';
 	
 	<div id="az-index" class="clearfix">
 		<?php
-			function getChars(){
-				$pages = get_pages();
+			function getChars($pages){
+				global $exclude;
+				//$pages = get_pages(array('sort_order' => 'asc', 'sort_column' => 'post_title', 'hierarchical' => false, 'exclude' => $exclude));
 				$letters = array();
 				foreach( (array) $pages as $pg ){
 					$parent = is_parent_private($pg->ID);
@@ -40,7 +41,8 @@ $pattern = '#[A-Za-z|~`!@\#$%^&*()_+=|\\}\][{\'/;\-":?>.<]#';
 					}
 					$title = ucwords($pg->post_title);
 					$char = $title{0};
-					if( !(is_numeric($char)) && !in_array($char, $letters) ){
+					if($char == 'Z') echo $title;
+					if(!in_array($char, $letters) ){
 						array_push($letters, $char);
 					}
 				}
@@ -49,7 +51,8 @@ $pattern = '#[A-Za-z|~`!@\#$%^&*()_+=|\\}\][{\'/;\-":?>.<]#';
 			
 			// Generate AZ Navigation 
 			echo '<nav class="btn-group">';
-			$anchors = getChars();
+			$pages = get_pages(array('sort_order' => 'asc', 'sort_column' => 'post_title', 'hierarchical' => false, 'exclude' => $exclude));
+			$anchors = getChars($pages);
 			foreach( range('A', 'Z') as $char ){
 				if( in_array( $char, $anchors ) ){
 					echo '<a href="#'.$char.'-pages" class="btn btn-default">'.$char.'</a>';
@@ -57,11 +60,18 @@ $pattern = '#[A-Za-z|~`!@\#$%^&*()_+=|\\}\][{\'/;\-":?>.<]#';
 					echo '<span class="btn btn-default disabled">'.$char.'</span>';
 				}
 			}
+			echo '</nav><nav class="btn-group">';
+			foreach( range('0', '9') as $char ){
+				if( in_array( (string)$char, $anchors ) ){
+					echo '<a href="#'.$char.'-pages" class="btn btn-default">'.$char.'</a>';
+				} else {
+					echo '<span class="btn btn-default disabled">'.$char.'</span>';
+				}
+			}
 			echo '</nav>';
 			
 			// Generate AZ List
-			$pages = get_pages(array('sort_order' => 'asc', 'sort_column' => 'post_title', 'hierarchical' => false, 'exclude' => $exclude));
-			if( !preg_match($pattern, $exclude, $matches) ){
+			//if( !preg_match($pattern, $exclude, $matches) ){
 				$letters = array();
 				echo '<section class="letter-directory">';
 				foreach( (array) $pages as $pg ){
@@ -74,7 +84,7 @@ $pattern = '#[A-Za-z|~`!@\#$%^&*()_+=|\\}\][{\'/;\-":?>.<]#';
 					}
 					$title = ucwords($pg->post_title);
 					$char = $title{0};
-					if( !( is_numeric($char) || empty($char) ) ){
+					if( !( empty($char) ) ){
 						if( $char != end($letters) && !empty($letters) ){
 							echo '</ol></div>';						  
 						}				
@@ -86,9 +96,9 @@ $pattern = '#[A-Za-z|~`!@\#$%^&*()_+=|\\}\][{\'/;\-":?>.<]#';
 					}
 				}
 				echo '</ol></div></section>';
-			} else {
-				echo '<p>Invalid input in field: "exclude"</p>';
-			}
+			//} else {
+			//	echo '<p>Invalid input in field: "exclude"</p>';
+			//}
 		?>
 	</div>
 <footer class="entry-footer">
diff --git a/inc/people-grid.php b/inc/people-grid.php
deleted file mode 100644
index 16ccfcd..0000000
--- a/inc/people-grid.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-$the_query = new WP_Query( $args );
-
-if ( $the_query->have_posts() ) { ?>
-	<div class="row">
-		<?php 
-		
-		//global $post;
-		//var_dump($post);
-		//echo "<br />";
-		
-		$person_count = 1;
-
-		while ( $the_query->have_posts() ) {
-			$the_query->the_post();
-			
-			
-			?>
-			
-			
-			<?php // 12/$persons_per_row ?>
-            <div class="col-sm-<?php echo 12/$persons_per_row; ?> personcount-<?php echo $person_count ?>" id="person-<?php echo get_the_id(); ?>">
-				<div class="person">
-						<?php 
-						$external_url = get_field('external_url');
-						if ( $external_url != "" ){
-							echo '<a href="'. $external_url .'" class="person-permalink" target="_blank">';
-						}else{
-							echo '<a href="'. get_the_permalink().'" class="person-permalink">';
-						}
-						if (in_array('photo', $information_to_display)) {
-							 echo '<div class="person-image">';
-								the_post_thumbnail('large');
-							echo '</div>';
-						};
-						
-						if (in_array('first_name', $information_to_display) || in_array('middle_name', $information_to_display) || in_array('last_name', $information_to_display)){
-							echo '<h4 class="person-name">';
-								if (in_array('first_name', $information_to_display)) {
-									the_field('first_name');
-									echo ' ';
-								};
-								if (in_array('middle_name', $information_to_display)) {
-									the_field('middle_name');
-									echo ' ';
-								};
-								if (in_array('last_name', $information_to_display)) {
-									the_field('last_name');
-								};
-							echo '</h4>';
-						};									
-						
-						echo '</a>';
-						
-						if (in_array('title', $information_to_display)) {
-							echo '<p class="person-title">';
-							$titlePieces = explode(";", get_field('title'));
-							foreach( $titlePieces as $t ){
-								echo ( !empty($t) ? "<strong>{$t}</strong><br>": "" );
-							}
-							echo '</p>';
-						};
-						if (in_array('department', $information_to_display)) {
-							echo '<p class="person-department">';
-							$departmentPieces = explode(";", get_field('department'));
-							foreach( $departmentPieces as $d ){
-								echo ( !empty($d) ? "<strong>{$d}</strong><br>": "" );
-							}
-							echo '</p>';
-						};
-						if (in_array('about', $information_to_display)) {
-							echo '<div class="person-about">';
-								the_field('about');
-							echo '</div>';
-						};
-						if (in_array('file', $information_to_display)) {
-							$file = get_field('file');
-							$urlLength =  strlen($file['url']);
-							if ($urlLength > 0){
-								echo '<p class="person-file">';
-									echo '<a href="'.$file['url'].'">'.$file['title'].'</a>';
-								echo '</p>';
-							}						
-						};
-						if (in_array('email', $information_to_display)) {
-							echo '<p class="person-email">';
-								echo '<a href="mailto:'.get_field('email').'">'.get_field('email').'</a>';
-							echo '</p>';
-						};
-						if (in_array('phone', $information_to_display)) {
-							echo '<p class="person-phone">';
-								the_field('phone');
-							echo '</p>';
-						};
-						if (in_array('phone_(alternate)', $information_to_display)) {
-							echo '<p class="person-phone_(alternate)">';
-								the_field('phone_(alternate)');
-							echo '</p>';
-						};
-						if (in_array('fax', $information_to_display)) {
-							echo '<p class="person-fax">';
-								the_field('fax');
-							echo '</p>';
-						};
-						if (in_array('mailing_address', $information_to_display)) {
-							echo '<p class="person-mailing_address">';
-							echo str_replace(';','<br>',get_field('mailing_address'));
-							echo '</p>';
-						};
-						if (in_array('office_location', $information_to_display)) {
-							echo '<p class="person-office_location">';
-								the_field('office_location');
-							echo '</p>';
-						};
-						if (in_array('campus', $information_to_display)) {
-							echo '<p class="person-campus">';
-								the_field('campus');
-							echo '</p>';
-						};
-						if (in_array('office_hours', $information_to_display)) {
-							echo '<p class="person-office_hours">';
-								the_field('office_hours');
-							echo '</p>';
-						};
-						if (in_array('courses', $information_to_display)) {
-							echo '<p class="person-courses">';
-								the_field('courses');
-							echo '</p>';
-						};
-						if (in_array('url', $information_to_display)) {
-							echo '<p class="person-url"><a href="'.get_field('url').'">'.get_field('url').'</a></p>';
-						};	?>
-				</div><!-- /person -->
-			</div> <!-- /col -->
-	
-			<?php 
-			// check to see if we need to close this row... 
-			//if ($person_count % $persons_per_row == 0){
-				if ( $person_count % $persons_per_row == 0 ){
-				// if this is the 4th, 8th, 16th, etc person... 
-				echo '</div><!-- /row --><div class="row">';		
-			}
-			$person_count++;		
-		} //end of posts?>
-		</div><!-- last row -->
-<?php 
-} else {
-	// no posts found
-}; ?>
-	
\ No newline at end of file
diff --git a/search.php b/search.php
index 31d7dc0..ae7745b 100644
--- a/search.php
+++ b/search.php
@@ -21,7 +21,8 @@ get_header(); ?>
 					<?php /* Start the Loop */ ?>
 					<?php while ( have_posts() ) : the_post();?>
 						<?php
-							$url = get_field('external_url');
+							$url = '';
+							if(function_exists('get_field')) $url = get_field('external_url');
 							if( empty($url) ){
 								$url = '<a href="'.get_permalink().'">';
 							}else{
diff --git a/user-people.php b/user-people.php
index 149c81b..fdb92fb 100644
--- a/user-people.php
+++ b/user-people.php
@@ -112,6 +112,12 @@ get_header(); ?>
 												$args[tax_query] = $tax_query;
 												
 											}
+											
+											$persons_per_row = get_field("persons_per_row"); // default is 4
+											if ( ! $persons_per_row ){
+												$persons_per_row = 4;
+											}
+												
 											if ($break_into_groups == 1 ){
 												//echo '<h1>Break into Groups</h1>';
 												
@@ -147,10 +153,7 @@ get_header(); ?>
 												//sort($groups_in_use);
 												usort($groups_in_use, 'sort_group_by_order' );
 
-												$persons_per_row = get_field("persons_per_row"); // default is 4
-												if ( ! $persons_per_row ){
-													$persons_per_row = 4;
-												}
+												
 		
 												// for each item in the list of terms, do a new query, but this time we're going to limit it to ONLY items from that one group. 
 												foreach($groups_in_use as $value){