diff --git a/assets/css/sportspress.css b/assets/css/sportspress.css
index 93c2c7a0..5a22283a 100644
--- a/assets/css/sportspress.css
+++ b/assets/css/sportspress.css
@@ -276,8 +276,9 @@
 	background: rgba(0, 0, 0, 0.02);
 }
 
-/* Highlight */
-.sp-highlight {
+/* Highlight & Heading */
+.sp-highlight,
+.sp-heading {
 	font-weight: bold;
 }
 
diff --git a/includes/admin/post-types/class-sp-admin-cpt-event.php b/includes/admin/post-types/class-sp-admin-cpt-event.php
index 40deaa9d..a7cf843e 100644
--- a/includes/admin/post-types/class-sp-admin-cpt-event.php
+++ b/includes/admin/post-types/class-sp-admin-cpt-event.php
@@ -66,7 +66,7 @@ class SP_Admin_CPT_Event extends SP_Admin_CPT {
 	public function wp_insert_post_data( $data, $postarr ) {
 		if ( $data['post_type'] == 'sp_event' && $data['post_title'] == '' ):
 
-			if ( 'teams' == get_option( 'sportspress_mode', 'teams' ) ) $post_type = 'sp_team';
+			if ( 'team' == get_option( 'sportspress_mode', 'team' ) ) $post_type = 'sp_team';
 			else $post_type = 'sp_player';
 
 			$teams = sp_array_value( $postarr, $post_type, array() );
@@ -96,7 +96,7 @@ class SP_Admin_CPT_Event extends SP_Admin_CPT {
 		unset( $existing_columns['author'], $existing_columns['comments'] );
 		$columns = array_merge( array(
 			'cb' => '<input type="checkbox" />',
-			'sp_format' => '<span class="dashicons sp-icon-calendar tips" title="' . __( 'Format', 'sportspress' ) . '"></span>',
+			'sp_format' => '<span class="dashicons sp-icon-calendar sp-tip" title="' . __( 'Format', 'sportspress' ) . '"></span>',
 			'title' => null,
 			'date' => __( 'Date', 'sportspress' ),
 			'sp_time' => __( 'Time', 'sportspress' ),
@@ -121,7 +121,7 @@ class SP_Admin_CPT_Event extends SP_Admin_CPT {
 				$formats = new SP_Formats();
 				$event_formats = $formats->event;
 				if ( array_key_exists( $format, $event_formats ) ):
-					echo '<span class="dashicons sp-icon-' . $format . ' tips" title="' . $event_formats[ $format ] . '"></span>';
+					echo '<span class="dashicons sp-icon-' . $format . ' sp-tip" title="' . $event_formats[ $format ] . '"></span>';
 				endif;
 				break;
 			case 'sp_time':
@@ -162,7 +162,7 @@ class SP_Admin_CPT_Event extends SP_Admin_CPT {
 									$team_results = implode( ' | ', $team_results );
 								endif;
 
-								echo '<a class="sp-result tips" tabindex="10" title="' . $team_results . '" data-team="' . $team_id . '" href="#">' . ( $team_result == '' ? '-' : $team_result ) . '</a>';
+								echo '<a class="sp-result sp-tip" tabindex="10" title="' . $team_results . '" data-team="' . $team_id . '" href="#">' . ( $team_result == '' ? '-' : $team_result ) . '</a>';
 								echo '<input type="text" tabindex="10" class="sp-edit-result hidden small-text" data-team="' . $team_id . '" data-key="' . $main_result . '" value="' . $team_result . '"> ';
 								echo $team->post_title;
 								echo '<br>';
@@ -175,11 +175,6 @@ class SP_Admin_CPT_Event extends SP_Admin_CPT {
 						<a href="#inline-edit" class="button-secondary cancel alignleft"><?php _e( 'Cancel' ); ?></a>
 						<?php wp_nonce_field( 'sp-save-inline-results', 'sp-inline-nonce', false ); ?>
 						<a href="#inline-edit" class="button-primary save alignright"><?php _e( 'Update' ); ?></a>
-						<span class="spinner"></span>
-						<input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />
-						<input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />
-						<span class="error" style="display:none"></span>
-						<br class="clear" />
 					</p>
 					<?php
 				endif;
diff --git a/includes/admin/post-types/class-sp-admin-cpt-player.php b/includes/admin/post-types/class-sp-admin-cpt-player.php
index 84934463..0f470a84 100755
--- a/includes/admin/post-types/class-sp-admin-cpt-player.php
+++ b/includes/admin/post-types/class-sp-admin-cpt-player.php
@@ -61,7 +61,7 @@ class SP_Admin_CPT_Player extends SP_Admin_CPT {
 		unset( $existing_columns['author'], $existing_columns['date'] );
 		$columns = array_merge( array(
 			'cb' => '<input type="checkbox" />',
-			'sp_number' => '<span class="dashicons sp-icon-tshirt tips" title="' . __( 'Number', 'sportspress' ) . '"></span>',
+			'sp_number' => '<span class="dashicons sp-icon-tshirt sp-tip" title="' . __( 'Number', 'sportspress' ) . '"></span>',
 			'title' => null,
 			'sp_position' => __( 'Positions', 'sportspress' ),
 			'sp_team' => __( 'Teams', 'sportspress' ),
diff --git a/includes/admin/post-types/class-sp-admin-cpt-team.php b/includes/admin/post-types/class-sp-admin-cpt-team.php
index 3d50be61..38164242 100644
--- a/includes/admin/post-types/class-sp-admin-cpt-team.php
+++ b/includes/admin/post-types/class-sp-admin-cpt-team.php
@@ -60,7 +60,7 @@ class SP_Admin_CPT_Team extends SP_Admin_CPT {
 		unset( $existing_columns['author'], $existing_columns['date'] );
 		$columns = array_merge( array(
 			'cb' => '<input type="checkbox" />',
-			'sp_icon' => '<span class="dashicons sp-icon-shield tips" title="' . __( 'Logo', 'sportspress' ) . '"></span>',
+			'sp_icon' => '<span class="dashicons sp-icon-shield sp-tip" title="' . __( 'Logo', 'sportspress' ) . '"></span>',
 			'title' => null,
 			'sp_url' => __( 'URL', 'sportspress' ),
 			'sp_abbreviation' => __( 'Abbreviation', 'sportspress' ),
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php
index 44ef7b59..f934d588 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php
@@ -149,7 +149,7 @@ class SP_Meta_Box_Calendar_Data {
 														$main_results[] = $team_result;
 														unset( $team_results['outcome'] );
 														$team_results = implode( ' | ', $team_results );
-														echo '<a class="result tips" title="' . $team_results . '" href="' . get_edit_post_link( $event->ID ) . '">' . $team_result . '</a> ';
+														echo '<a class="result sp-tip" title="' . $team_results . '" href="' . get_edit_post_link( $event->ID ) . '">' . $team_result . '</a> ';
 													endif;
 
 													echo $name . '<br>';
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php
index c7edd959..4adf9d03 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php
@@ -53,7 +53,7 @@ class SP_Meta_Box_Event_Teams {
 					sp_dropdown_taxonomies( $args );
 					?>
 				</p>
-				<?php if ( 'teams' == get_option( 'sportspress_mode', 'teams' ) ) { ?>
+				<?php if ( 'team' == get_option( 'sportspress_mode', 'team' ) ) { ?>
 					<p class="sp-tab-select sp-title-generator">
 					<?php
 					$args = array(
@@ -61,7 +61,6 @@ class SP_Meta_Box_Event_Teams {
 						'name' => 'sp_team[]',
 						'class' => 'sportspress-pages',
 						'show_option_none' => __( '&mdash; None &mdash;', 'sportspress' ),
-						'show_option_all' => __( '&mdash; Individual &mdash;', 'sportspress' ),
 						'values' => 'ID',
 						'selected' => $team,
 					);
@@ -88,7 +87,7 @@ class SP_Meta_Box_Event_Teams {
 	 * Save meta box data
 	 */
 	public static function save( $post_id, $post ) {
-		if ( 'teams' == get_option( 'sportspress_mode', 'teams' ) ) {
+		if ( 'team' == get_option( 'sportspress_mode', 'team' ) ) {
 			sp_update_post_meta_recursive( $post_id, 'sp_team', sp_array_value( $_POST, 'sp_team', array() ) );
 		}
 		sp_update_post_meta_recursive( $post_id, 'sp_player', sp_array_value( $_POST, 'sp_player', array() ) );
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-statistics.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-statistics.php
index 1683ee4c..b8613369 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-statistics.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-statistics.php
@@ -98,13 +98,12 @@ class SP_Meta_Box_Player_Statistics {
 								<?php else: ?>
 									<td>
 										<?php $value = sp_array_value( $leagues, $div_id, '-1' ); ?>
-										<?php if ( 'teams' == get_option( 'sportspress_mode', 'teams' )  ) { ?>
+										<?php if ( 'team' == get_option( 'sportspress_mode', 'team' )  ) { ?>
 											<?php
 											$args = array(
 												'post_type' => 'sp_team',
 												'name' => 'sp_leagues[' . $league_id . '][' . $div_id . ']',
 												'show_option_none' => __( '&mdash; None &mdash;', 'sportspress' ),
-												'show_option_all' => __( '&mdash; Individual &mdash;', 'sportspress' ),
 											    'sort_order'   => 'ASC',
 											    'sort_column'  => 'menu_order',
 												'selected' => $value,
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-data.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-data.php
index 4c3a274e..1a3b88c0 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-data.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-table-data.php
@@ -53,7 +53,7 @@ class SP_Meta_Box_Table_Data {
 			<table class="widefat sp-data-table sp-league-table">
 				<thead>
 					<tr>
-						<th class="radio"><span class="dashicons sp-icon-shield tips" title="<?php _e( 'Highlight', 'sportspress' ); ?>"></span></th>
+						<th class="radio"><span class="dashicons sp-icon-shield sp-tip" title="<?php _e( 'Highlight', 'sportspress' ); ?>"></span></th>
 						<th><?php _e( 'Team', 'sportspress' ); ?></th>
 						<?php foreach ( $columns as $key => $label ): ?>
 							<th><label for="sp_columns_<?php echo $key; ?>">
diff --git a/includes/admin/views/html-admin-page-status.php b/includes/admin/views/html-admin-page-status.php
index b2bc9b94..cbcae17a 100644
--- a/includes/admin/views/html-admin-page-status.php
+++ b/includes/admin/views/html-admin-page-status.php
@@ -7,7 +7,7 @@
 	<div id="debug-report"><textarea readonly="readonly"></textarea></div>
 </div>
 <br/>
-<table class="sp_status_table widefat" cellspacing="0">
+<table class="sp-status-table widefat" cellspacing="0">
 
 	<thead>
 		<tr>
@@ -509,7 +509,7 @@
 
 		var report = "";
 
-		jQuery('.sp_status_table thead, .sp_status_table tbody').each(function(){
+		jQuery('.sp-status-table thead, .sp-status-table tbody').each(function(){
 
 			if ( jQuery( this ).is('thead') ) {