diff --git a/assets/css/slickmap.css b/assets/css/slickmap.css
index ce6b60e8..c041b989 100644
--- a/assets/css/slickmap.css
+++ b/assets/css/slickmap.css
@@ -41,26 +41,23 @@ table, .sp-sitemap caption, .sp-sitemap tbody, .sp-sitemap tfoot, .sp-sitemap th
 ------------------------------------------------------------ */
 
 .sp-sitemap li {
-	width: 10%;
+	width: 12.5%;
 }
 
 .sp-sitemap li ul li {
 	width:100% !important;
 }
 
-.sp-sitemap .col0 { max-width: 300px; }
-.sp-sitemap .col1 { max-width: 300px; }
-.sp-sitemap .col2 { max-width: 600px; }
-.sp-sitemap .col3 { max-width: 900px; }
-.sp-sitemap .col4 { max-width: 1200px; }
-.sp-sitemap .col5 { max-width: 1500px; }
-.sp-sitemap .col6 { max-width: 1800px; }
-.sp-sitemap .col7 { max-width: 2100px; }
-.sp-sitemap .col8 { max-width: 2400px; }
-.sp-sitemap .col9 { max-width: 2700px; }
-.sp-sitemap .col10 { max-width: 3000px; }
-.sp-sitemap .col11 { max-width: 3300px; }
-.sp-sitemap .col12 { max-width: 3600px; }
+.sp-sitemap .sp-primary { max-width: 1600px; }
+.sp-sitemap .col0 { max-width: 200px; }
+.sp-sitemap .col1 { max-width: 200px; }
+.sp-sitemap .col2 { max-width: 400px; }
+.sp-sitemap .col3 { max-width: 600px; }
+.sp-sitemap .col4 { max-width: 800px; }
+.sp-sitemap .col5 { max-width: 1000px; }
+.sp-sitemap .col6 { max-width: 1200px; }
+.sp-sitemap .col7 { max-width: 1400px; }
+.sp-sitemap .col8 { max-width: 1600px; }
 
 .sp-sitemap .col1 li { width:99.9%; }
 .sp-sitemap .col2 li { width:50%; }
@@ -70,10 +67,6 @@ table, .sp-sitemap caption, .sp-sitemap tbody, .sp-sitemap tfoot, .sp-sitemap th
 .sp-sitemap .col6 li { width:16.6%; }
 .sp-sitemap .col7 li { width:14.2%; }
 .sp-sitemap .col8 li { width:12.5%; }
-.sp-sitemap .col9 li { width:11.1%; }
-.sp-sitemap .col10 li { width:10%; }
-.sp-sitemap .col11 li { width:9%; }
-.sp-sitemap .col12 li { width:8.3%; }
 
 /* ------------------------------------------------------------
 	General Styles
@@ -117,7 +110,6 @@ table, .sp-sitemap caption, .sp-sitemap tbody, .sp-sitemap tfoot, .sp-sitemap th
 	top: 9px;
 }
 .sp-sitemap li a.button span.dashicons-plus {
-	left: 12px;
 	top: 12px;
 }
 .sp-sitemap li a.button-primary span {
diff --git a/includes/admin/views/html-admin-overview.php b/includes/admin/views/html-admin-overview.php
index 1f5f1fd5..a6fb4a67 100644
--- a/includes/admin/views/html-admin-overview.php
+++ b/includes/admin/views/html-admin-overview.php
@@ -27,10 +27,10 @@
 									<li>
 										<?php if ( ! $children && sizeof ( $post_types ) <= 1 ): ?>
 											<?php if ( sizeof( $post_types ) ): foreach ( $post_types as $post_type ): ?>
-												<a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $term->slug ), 'edit.php' ) ) ); ?>"><?php echo $term->name; ?><span class="dashicons dashicons-list-view wp-ui-text-notification"></span></a>
+												<a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $term->slug ), 'edit.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $term->name ); ?><span class="dashicons dashicons-list-view wp-ui-text-notification"></span></a>
 											<?php endforeach; endif; ?>
 										<?php else: ?>
-											<a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $term->term_id ), 'admin.php' ) ) ); ?>"><?php echo $term->name; ?></a>
+											<a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $term->term_id ), 'admin.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $term->name ); ?></a>
 										<?php endif; ?>
 
 										<?php if ( $children ): ?>
@@ -39,10 +39,10 @@
 													<li>
 														<?php if ( sizeof( $post_types ) <= 1 ): ?>
 															<?php if ( sizeof( $post_types ) ): foreach ( $post_types as $post_type ): ?>
-																<a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $child->slug ), 'edit.php' ) ) ); ?>"><?php echo $child->name; ?><span class="dashicons dashicons-list-view wp-ui-text-highlight"></span></a>
+																<a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $child->slug ), 'edit.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $child->name ); ?><span class="dashicons dashicons-list-view wp-ui-text-highlight"></span></a>
 															<?php endforeach; endif; ?>
 														<?php else: ?>
-															<a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $child->term_id ), 'admin.php' ) ) ); ?>"><?php echo $child->name; ?></a>
+															<a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $child->term_id ), 'admin.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $child->name ); ?></a>
 														<?php endif; ?>
 													</li>
 												<?php endforeach; ?>
@@ -75,7 +75,7 @@
 					<ul class="sp-primary col<?php echo sizeof( $terms ) + 1; ?>">
 						<li class="sp-breadcrumb"><a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview' ), 'admin.php' ) ) ); ?>"><?php _e( 'SportsPress', 'sportspress' ); ?></a></li>
 						<li class="sp-breadcrumb"><a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy ), 'admin.php' ) ) ); ?>"><?php echo $taxonomy_object->labels->name; ?></a></li>
-						<li class="sp-home"><a class="button disabled"><?php echo $term->name; ?></a></li>
+						<li class="sp-home"><a class="button disabled"><?php echo wp_strip_all_tags( $term->name ); ?></a></li>
 						<li><a class="button disabled"><?php _e( 'All', 'sportspress' ); ?></a>
 							<ul>
 								<?php if ( sizeof ( $post_types ) ): ?>
@@ -86,14 +86,14 @@
 							</ul>
 						</li>
 						<?php foreach ( $terms as $term ): ?>
-							<li><a class="button button-primary" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $term->term_id ), 'admin.php' ) ) ); ?>"><?php echo $term->name; ?></a>
+							<li><a class="button button-primary" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $term->term_id ), 'admin.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $term->name ); ?></a>
 								<?php $children = get_terms( $taxonomy, array( 'hide_empty' => false, 'parent' => $term->term_id, 'orderby' => 'slug' ) ); ?>
 
 								<?php if ( $children ): // Has children ?>
 
 									<ul>
 										<?php foreach ( $children as $child ): ?>
-											<li><a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $child->slug ), 'edit.php' ) ) ); ?>"><?php echo $child->name; ?><span class="dashicons dashicons-list-view wp-ui-text-notification"></span></a>
+											<li><a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $child->slug ), 'edit.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $child->name ); ?><span class="dashicons dashicons-list-view wp-ui-text-notification"></span></a>
 
 												<?php if ( sizeof ( $post_types ) ): // Has associated post types ?>
 													<ul>
@@ -129,7 +129,7 @@
 						<?php if ( $term->parent ): $parent = get_term( $term->parent, $taxonomy ); ?>
 							<li class="sp-breadcrumb"><a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $term->parent ), 'admin.php' ) ) ); ?>"><?php echo $parent->name; ?></a></li>
 						<?php endif; ?>
-						<li class="sp-home"><a class="button disabled"><?php echo $term->name; ?></a></li>
+						<li class="sp-home"><a class="button disabled"><?php echo wp_strip_all_tags( $term->name ); ?></a></li>
 						<?php if ( sizeof ( $taxonomy_object->object_type ) ): ?>
 							<ul>
 								<?php foreach ( $post_types as $post_type ): $post_object = get_post_type_object( $post_type ); ?>
@@ -151,9 +151,9 @@
 						<?php foreach ( $terms as $term ): ?>
 							<li>
 								<?php if ( sizeof( $post_types ) <= 1 ): $post_type = reset( $post_types ); ?>
-									<a class="button button-primary action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $term->slug ), 'edit.php' ) ) ); ?>"><?php echo $term->name; ?><span class="dashicons dashicons-list-view"></span></a>
+									<a class="button button-primary action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $term->slug ), 'edit.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $term->name ); ?><span class="dashicons dashicons-list-view"></span></a>
 								<?php else: ?>
-									<a class="button button-primary" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $term->term_id ), 'admin.php' ) ) ); ?>"><?php echo $term->name; ?></a>
+									<a class="button button-primary" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $term->term_id ), 'admin.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $term->name ); ?></a>
 								<?php endif; ?>
 								<?php $children = get_terms( $taxonomy, array( 'hide_empty' => false, 'parent' => $term->term_id, 'orderby' => 'slug' ) ); ?>
 								<ul>
@@ -165,7 +165,7 @@
 											<?php foreach ( $children as $child ): ?>
 												<?php if ( sizeof ( $post_types ) ): ?>
 													<?php foreach ( $post_types as $post_type ): $post_object = get_post_type_object( $post_type ); ?>
-														<li><a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $child->slug ), 'edit.php' ) ) ); ?>"><?php echo $child->name; ?><span class="dashicons dashicons-list-view wp-ui-text-notification"></span></a></li>
+														<li><a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $child->slug ), 'edit.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $child->name ); ?><span class="dashicons dashicons-list-view wp-ui-text-notification"></span></a></li>
 													<?php endforeach; ?>
 												<?php endif; ?>
 											<?php endforeach; ?>
@@ -181,7 +181,7 @@
 											<?php endif; ?>
 
 											<?php foreach ( $children as $child ): ?>
-												<li><a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $child->term_id ), 'admin.php' ) ) ); ?>"><?php echo $child->name; ?></a>
+												<li><a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview', 'taxonomy' => $taxonomy, 'term' => $child->term_id ), 'admin.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $child->name ); ?></a>
 													<?php if ( sizeof ( $post_types ) ): ?>
 														<ul>
 															<?php foreach ( $post_types as $post_type ): $post_object = get_post_type_object( $post_type ); ?>
@@ -221,21 +221,21 @@
 			?>
 
 			<ul class="sp-utility">
-				<li><a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type ), 'edit.php' ) ) ); ?>"><?php _e( 'View All', 'sportspress' ); ?></a></li>
 				<li><a class="button button-primary" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type ), 'post-new.php' ) ) ); ?>"><?php echo $post_object->labels->add_new_item; ?></a></li>
+				<li><a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type ), 'edit.php' ) ) ); ?>"><?php _e( 'View All', 'sportspress' ); ?></a></li>
 			</ul>
 
 			<?php if ( sizeof( $taxonomies ) || sizeof( sp_array_value( $hierarchy, $post_type ) ) ): // Display taxonomies ?>
 				<ul class="sp-primary col<?php echo sizeof( $taxonomies ) + sizeof( sp_array_value( $hierarchy, $post_type ) ); ?>">
 					<li class="sp-breadcrumb"><a class="button" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'sp-overview' ), 'admin.php' ) ) ); ?>"><?php _e( 'SportsPress', 'sportspress' ); ?></a></li>
 					<li class="sp-home"><a class="button disabled"><?php echo $post_object->labels->name; ?></a></li>
-					<?php foreach ( sp_array_value( $hierarchy, $post_type ) as $secondary_post_type ): $secondary_post_object = get_post_type_object( $secondary_post_type );?>
+					<?php foreach ( sp_array_value( $hierarchy, $post_type ) as $secondary_post_type ): $secondary_post_object = get_post_type_object( $secondary_post_type ); ?>
 						<li><a class="button button-primary action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $secondary_post_type ), 'edit.php' ) ) ); ?>"><?php echo $secondary_post_object->labels->name; ?><span class="dashicons dashicons-list-view"></span></a>
 							<?php $posts = get_posts( array( 'posts_per_page' => -1, 'post_type' => $secondary_post_type ) ); ?>
 							<?php if ( $posts ): ?>
 								<ul>
 									<?php foreach ( $posts as $post ): ?>
-										<li><a class="button action" href="<?php echo esc_url( get_edit_post_link( $post->ID ) ); ?>"><?php echo $post->post_title; ?><span class="dashicons dashicons-edit wp-ui-text-notification"></span></a></li>
+										<li><a class="button action" href="<?php echo esc_url( get_edit_post_link( $post->ID ) ); ?>"><?php echo wp_strip_all_tags( $post->post_title ); ?><span class="dashicons dashicons-edit wp-ui-text-notification"></span></a></li>
 									<?php endforeach; ?>
 								</ul>
 							<?php endif; ?>
@@ -247,14 +247,14 @@
 							<?php if ( $terms ): ?>
 								<ul>
 									<?php foreach ( $terms as $term ): ?>
-										<li><a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $term->slug ), 'edit.php' ) ) ); ?>"><?php echo $term->name; ?><span class="dashicons dashicons-list-view wp-ui-text-notification"></span></a>
+										<li><a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $term->slug ), 'edit.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $term->name ); ?><span class="dashicons dashicons-list-view wp-ui-text-notification"></span></a>
 											<?php $children = get_terms( $taxonomy, array( 'hide_empty' => false, 'parent' => $term->term_id, 'orderby' => 'slug' ) ); ?>
 
 											<?php if ( $children ): // Has children ?>
 
 												<ul>
 													<?php foreach ( $children as $child ): ?>
-														<li><a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $child->slug ), 'edit.php' ) ) ); ?>"><?php echo $child->name; ?><span class="dashicons dashicons-list-view wp-ui-text-highlight"></span></a></li>
+														<li><a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $child->slug ), 'edit.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $child->name ); ?><span class="dashicons dashicons-list-view wp-ui-text-highlight"></span></a></li>
 													<?php endforeach; ?>
 												</ul>
 
@@ -276,7 +276,7 @@
 					<li class="sp-home"><a class="button disabled"><?php echo $post_object->labels->name; ?></a></li>
 					<?php if ( $posts ): ?>
 						<?php foreach ( $posts as $post ): ?>
-							<li><a class="button button-primary action" href="<?php echo esc_url( get_edit_post_link( $post->ID ) ); ?>"><?php echo $post->post_title; ?><span class="dashicons dashicons-edit"></span></a></li>
+							<li><a class="button button-primary action" href="<?php echo esc_url( get_edit_post_link( $post->ID ) ); ?>"><?php echo wp_strip_all_tags( $post->post_title ); ?><span class="dashicons dashicons-edit"></span></a></li>
 						<?php endforeach; ?>
 					<?php else: ?>
 						<li><a class="button disabled"><?php _e( 'No results found.', 'sportspress' ); ?></a></li>
@@ -297,14 +297,14 @@
 				<li class="sp-home"><a class="button disabled"><?php echo $taxonomy_object->labels->name; ?></a></li>
 
 				<?php if ( $terms ): foreach ( $terms as $term ): ?>
-					<li><a class="button button-primary action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $term->slug ), 'edit.php' ) ) ); ?>"><?php echo $term->name; ?><span class="dashicons dashicons-list-view"></span></a>
+					<li><a class="button button-primary action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $term->slug ), 'edit.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $term->name ); ?><span class="dashicons dashicons-list-view"></span></a>
 						<?php $children = get_terms( $taxonomy, array( 'hide_empty' => false, 'parent' => $term->term_id, 'orderby' => 'slug' ) ); ?>
 
 						<?php if ( $children ): // Has children ?>
 
 							<ul>
 								<?php foreach ( $children as $child ): ?>
-									<li><a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $child->slug ), 'edit.php' ) ) ); ?>"><?php echo $child->name; ?><span class="dashicons dashicons-list-view wp-ui-text-notification"></span></a>
+									<li><a class="button action" href="<?php echo esc_url( admin_url( add_query_arg( array( 'post_type' => $post_type, $taxonomy => $child->slug ), 'edit.php' ) ) ); ?>"><?php echo wp_strip_all_tags( $child->name ); ?><span class="dashicons dashicons-list-view wp-ui-text-notification"></span></a>
 										<?php $grandchildren = get_terms( $taxonomy, array( 'hide_empty' => false, 'parent' => $child->term_id, 'orderby' => 'slug' ) ); ?>
 
 										<?php if ( $grandchildren ): // Has grandchildren ?>