diff --git a/includes/sp-template-functions.php b/includes/sp-template-functions.php
index dba4907e..71bb7064 100644
--- a/includes/sp-template-functions.php
+++ b/includes/sp-template-functions.php
@@ -516,7 +516,7 @@ if ( ! function_exists( 'sportspress_responsive_tables_css' ) ) {
 	 * @subpackage	Responsive
 	 * @return void
 	 */
-	function sportspress_responsive_tables_css( $vars, $identity ) {
+	function sportspress_responsive_tables_css( $identity ) {
 		$custom_css = '/* 
 		Max width before this PARTICULAR table gets nasty
 		This query will take effect for any screen smaller than 760px
@@ -526,7 +526,7 @@ if ( ! function_exists( 'sportspress_responsive_tables_css' ) ) {
 		only screen and (max-width: 800px) {
 		
 			/* Force table to not be like tables anymore */
-			table.'.$identity.', table.'.$identity.' thead, table.'.$identity.' tbody, table.'.$identity.' th, table.'.$identity.' td, table.'.$identity.' tr { 
+			table.'.$identity.', table.'.$identity.' thead, table.'.$identity.' tfoot, table.'.$identity.' tbody, table.'.$identity.' th, table.'.$identity.' td, table.'.$identity.' tr { 
 				display: block; 
 			}
 			
@@ -556,6 +556,8 @@ if ( ! function_exists( 'sportspress_responsive_tables_css' ) ) {
 			table.'.$identity.' td:before { 
 				/* Now like a table header */
 				position: absolute;
+				/* Label the data */
+				content: attr(data-label);
 				/* Top/left values mimic padding */
 				top: 6px;
 				left: 6px;
@@ -563,19 +565,8 @@ if ( ! function_exists( 'sportspress_responsive_tables_css' ) ) {
 				padding-right: 10px; 
 				white-space: nowrap;
 			}
-			
-			/*
-			Label the data
-			*/
-			';
-		$k=1;
-		foreach ( $vars as $label ) {
-			$custom_css .= 'table.'.$identity.' td:nth-of-type('.$k.'):before { content: "'.$label.'"; }
-			';
-			$k++;
 		}
-		
-		$custom_css .= ' } ';
+			';
 		
 		$dummystyle = 'sportspress-style-inline-'.$identity;
 		wp_register_style( $dummystyle, false );
diff --git a/templates/event-list.php b/templates/event-list.php
index baf8029a..7cd81a84 100644
--- a/templates/event-list.php
+++ b/templates/event-list.php
@@ -106,13 +106,11 @@ $identifier = uniqid( 'eventlist_' );
 				<tr>
 					<?php
 					echo '<th class="data-date">' . __( 'Date', 'sportspress' ) . '</th>';
-					$labels[] = __( 'Date', 'sportspress' );
 
 					switch ( $title_format ) {
 						case 'homeaway':
 							if ( sp_column_active( $usecolumns, 'event' ) ) {
 								echo '<th class="data-home">' . __( 'Home', 'sportspress' ) . '</th>';
-								$labels[] = __( 'Home', 'sportspress' );
 							}
 
 							if ( 'combined' == $time_format && sp_column_active( $usecolumns, 'time' ) ) {
@@ -120,74 +118,59 @@ $identifier = uniqid( 'eventlist_' );
 								$labels[] = __( 'Time/Results', 'sportspress' );
 							} elseif ( in_array( $time_format, array( 'separate', 'results' ) ) && sp_column_active( $usecolumns, 'results' ) ) {
 								echo '<th class="data-results">' . __( 'Results', 'sportspress' ) . '</th>';
-								$labels[] = __( 'Results', 'sportspress' );
 							}
 
 							if ( sp_column_active( $usecolumns, 'event' ) ) {
 								echo '<th class="data-away">' . __( 'Away', 'sportspress' ) . '</th>';
-								$labels[] = __( 'Away', 'sportspress' );
 							}
 
 							if ( in_array( $time_format, array( 'separate', 'time' ) ) && sp_column_active( $usecolumns, 'time' ) ) {
 								echo '<th class="data-time">' . __( 'Time', 'sportspress' ) . '</th>';
-								$labels[] = __( 'Time', 'sportspress' );
 							}
 							break;
 						default:
 							if ( sp_column_active( $usecolumns, 'event' ) ) {
 								if ( $title_format == 'teams' ){
 									echo '<th class="data-teams">' . __( 'Teams', 'sportspress' ) . '</th>';
-									$labels[] = __( 'Teams', 'sportspress' );
 								}else{
 									echo '<th class="data-event">' . __( 'Event', 'sportspress' ) . '</th>';
-								$labels[] = __( 'Event', 'sportspress' );}
 							}
 
 							switch ( $time_format ) {
 								case 'separate':
 									if ( sp_column_active( $usecolumns, 'time' ) )
 										echo '<th class="data-time">' . __( 'Time', 'sportspress' ) . '</th>';
-										$labels[] = __( 'Time', 'sportspress' );
 									if ( sp_column_active( $usecolumns, 'results' ) )
 										echo '<th class="data-results">' . __( 'Results', 'sportspress' ) . '</th>';
-										$labels[] = __( 'Results', 'sportspress' );
 									break;
 								case 'time':
 									if ( sp_column_active( $usecolumns, 'time' ) )
 										echo '<th class="data-time">' . __( 'Time', 'sportspress' ) . '</th>';
-										$labels[] = __( 'Time', 'sportspress' );
 									break;
 								case 'results':
 									if ( sp_column_active( $usecolumns, 'results' ) )
 										echo '<th class="data-results">' . __( 'Results', 'sportspress' ) . '</th>';
-										$labels[] = __( 'Results', 'sportspress' );
 									break;
 								default:
 									if ( sp_column_active( $usecolumns, 'time' ) )
 										echo '<th class="data-time">' . __( 'Time/Results', 'sportspress' ) . '</th>';
-										$labels[] = __( 'Time/Results', 'sportspress' );
 							}
 					}
 
 					if ( sp_column_active( $usecolumns, 'league' ) )
 						echo '<th class="data-league">' . __( 'League', 'sportspress' ) . '</th>';
-						$labels[] = __( 'League', 'sportspress' );
 
 					if ( sp_column_active( $usecolumns, 'season' ) )
 						echo '<th class="data-season">' . __( 'Season', 'sportspress' ) . '</th>';
-						$labels[] = __( 'Season', 'sportspress' );
 
 					if ( sp_column_active( $usecolumns, 'venue' ) )
 						echo '<th class="data-venue">' . __( 'Venue', 'sportspress' ) . '</th>';
-						$labels[] = __( 'Venue', 'sportspress' );
 
 					if ( sp_column_active( $usecolumns, 'article' ) )
 						echo '<th class="data-article">' . __( 'Article', 'sportspress' ) . '</th>';
-						$labels[] = __( 'Article', 'sportspress' );
 
 					if ( sp_column_active( $usecolumns, 'day' ) )
 						echo '<th class="data-day">' . __( 'Match Day', 'sportspress' ) . '</th>';
-						$labels[] = __( 'Match Day', 'sportspress' );
 
 					do_action( 'sportspress_event_list_head_row', $usecolumns );
 					?>
@@ -263,17 +246,17 @@ $identifier = uniqid( 'eventlist_' );
 
 						if ( $link_events ) $date_html = '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">' . $date_html . '</a>';
 
-						echo '<td class="data-date" itemprop="startDate" content="' . mysql2date( 'Y-m-d\TH:iP', $event->post_date ) . '">' . $date_html . '</td>';
+						echo '<td class="data-date" itemprop="startDate" content="' . mysql2date( 'Y-m-d\TH:iP', $event->post_date ) . '" data-label="'.__( 'Date', 'sportspress' ).'">' . $date_html . '</td>';
 
 						switch ( $title_format ) {
 							case 'homeaway':
 								if ( sp_column_active( $usecolumns, 'event' ) ) {
 									$team = array_shift( $teams_array );
-									echo '<td class="data-home' . $team_class . '" itemprop="competitor" itemscope itemtype="http://schema.org/SportsTeam">' . $team . '</td>';
+									echo '<td class="data-home' . $team_class . '" itemprop="competitor" itemscope itemtype="http://schema.org/SportsTeam" data-label="'.__( 'Home', 'sportspress' ).'">' . $team . '</td>';
 								}
 
 								if ( 'combined' == $time_format && sp_column_active( $usecolumns, 'time' ) ) {
-									echo '<td class="data-time">';
+									echo '<td class="data-time" data-label="'.__( 'Time/Results', 'sportspress' ).'">';
 									if ( $link_events ) echo '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">';
 									if ( ! empty( $main_results ) ):
 										echo implode( ' - ', $main_results );
@@ -283,7 +266,7 @@ $identifier = uniqid( 'eventlist_' );
 									if ( $link_events ) echo '</a>';
 									echo '</td>';
 								} elseif ( in_array( $time_format, array( 'separate', 'results' ) ) && sp_column_active( $usecolumns, 'results' ) ) {
-									echo '<td class="data-results">';
+									echo '<td class="data-results" data-label="'.__( 'Results', 'sportspress' ).'">';
 									if ( $link_events ) echo '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">';
 									if ( ! empty( $main_results ) ):
 										echo implode( ' - ', $main_results );
@@ -296,11 +279,11 @@ $identifier = uniqid( 'eventlist_' );
 
 								if ( sp_column_active( $usecolumns, 'event' ) ) {
 									$team = array_shift( $teams_array );
-									echo '<td class="data-away' . $team_class . '" itemprop="competitor" itemscope itemtype="http://schema.org/SportsTeam">' . $team . '</td>';
+									echo '<td class="data-away' . $team_class . '" itemprop="competitor" itemscope itemtype="http://schema.org/SportsTeam" data-label="'.__( 'Away', 'sportspress' ).'">' . $team . '</td>';
 								}
 
 								if ( in_array( $time_format, array( 'separate', 'time' ) ) && sp_column_active( $usecolumns, 'time' ) ) {
-									echo '<td class="data-time">';
+									echo '<td class="data-time" data-label="'.__( 'Time', 'sportspress' ).'">';
 									if ( $link_events ) echo '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">';
 									echo '<date>&nbsp;' . get_post_time( 'H:i:s', false, $event ) . '</date>' . apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID );
 									if ( $link_events ) echo '</a>';
@@ -310,25 +293,25 @@ $identifier = uniqid( 'eventlist_' );
 							default:
 								if ( sp_column_active( $usecolumns, 'event' ) ) {
 									if ( $title_format == 'teams' ) {
-										echo '<td class="data-event data-teams">' . $teams_output . '</td>';
+										echo '<td class="data-event data-teams" data-label="'.__( 'Teams', 'sportspress' ).'">' . $teams_output . '</td>';
 									} else {
 										$title_html = implode( ' ', $team_logos ) . ' ' . $event->post_title;
 										if ( $link_events ) $title_html = '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">' . $title_html . '</a>';
-										echo '<td class="data-event">' . $title_html . '</td>';
+										echo '<td class="data-event" data-label="'.__( 'Event', 'sportspress' ).'">' . $title_html . '</td>';
 									}
 								}
 
 								switch ( $time_format ) {
 									case 'separate':
 										if ( sp_column_active( $usecolumns, 'time' ) ) {
-											echo '<td class="data-time">';
+											echo '<td class="data-time" data-label="'.__( 'Time', 'sportspress' ).'">';
 											if ( $link_events ) echo '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">';
 											echo '<date>&nbsp;' . get_post_time( 'H:i:s', false, $event ) . '</date>' . apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID );
 											if ( $link_events ) echo '</a>';
 											echo '</td>';
 										}
 										if ( sp_column_active( $usecolumns, 'results' ) ) {
-											echo '<td class="data-results">';
+											echo '<td class="data-results" data-label="'.__( 'Results', 'sportspress' ).'">';
 											if ( $link_events ) echo '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">';
 											if ( ! empty( $main_results ) ):
 												echo implode( ' - ', $main_results );
@@ -341,7 +324,7 @@ $identifier = uniqid( 'eventlist_' );
 										break;
 									case 'time':
 										if ( sp_column_active( $usecolumns, 'time' ) ) {
-											echo '<td class="data-time">';
+											echo '<td class="data-time" data-label="'.__( 'Time', 'sportspress' ).'">';
 											if ( $link_events ) echo '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">';
 											echo '<date>&nbsp;' . get_post_time( 'H:i:s', false, $event ) . '</date>' . apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID );
 											if ( $link_events ) echo '</a>';
@@ -350,7 +333,7 @@ $identifier = uniqid( 'eventlist_' );
 										break;
 									case 'results':
 										if ( sp_column_active( $usecolumns, 'results' ) ) {
-											echo '<td class="data-results">';
+											echo '<td class="data-results" data-label="'.__( 'Results', 'sportspress' ).'">';
 											if ( $link_events ) echo '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">';
 											if ( ! empty( $main_results ) ):
 												echo implode( ' - ', $main_results );
@@ -363,7 +346,7 @@ $identifier = uniqid( 'eventlist_' );
 										break;
 									default:
 										if ( sp_column_active( $usecolumns, 'time' ) ) {
-											echo '<td class="data-time">';
+											echo '<td class="data-time" data-label="'.__( 'Time/Results', 'sportspress' ).'">';
 											if ( $link_events ) echo '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">';
 											if ( ! empty( $main_results ) ):
 												echo implode( ' - ', $main_results );
@@ -377,7 +360,7 @@ $identifier = uniqid( 'eventlist_' );
 						}
 
 						if ( sp_column_active( $usecolumns, 'league' ) ):
-							echo '<td class="data-league">';
+							echo '<td class="data-league" data-label="'.__( 'League', 'sportspress' ).'">';
 							$leagues = get_the_terms( $event->ID, 'sp_league' );
 							if ( $leagues ): foreach ( $leagues as $league ):
 								echo $league->name;
@@ -386,7 +369,7 @@ $identifier = uniqid( 'eventlist_' );
 						endif;
 
 						if ( sp_column_active( $usecolumns, 'season' ) ):
-							echo '<td class="data-season">';
+							echo '<td class="data-season" data-label="'.__( 'Season', 'sportspress' ).'">';
 							$seasons = get_the_terms( $event->ID, 'sp_season' );
 							if ( $seasons ): foreach ( $seasons as $season ):
 								echo $season->name;
@@ -395,7 +378,7 @@ $identifier = uniqid( 'eventlist_' );
 						endif;
 
 						if ( sp_column_active( $usecolumns, 'venue' ) ):
-							echo '<td class="data-venue">';
+							echo '<td class="data-venue" data-label="'.__( 'Venue', 'sportspress' ).'">';
 							if ( $link_venues ):
 								the_terms( $event->ID, 'sp_venue' );
 							else:
@@ -408,7 +391,7 @@ $identifier = uniqid( 'eventlist_' );
 						endif;
 
 						if ( sp_column_active( $usecolumns, 'article' ) ):
-							echo '<td class="data-article">';
+							echo '<td class="data-article" data-label="'.__( 'Article', 'sportspress' ).'">';
 								if ( $link_events ) echo '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">';
 
 								if ( $video ):
@@ -429,7 +412,7 @@ $identifier = uniqid( 'eventlist_' );
 						endif;
 
 						if ( sp_column_active( $usecolumns, 'day' ) ):
-							echo '<td class="data-day">';
+							echo '<td class="data-day" data-label="'.__( 'Match Day', 'sportspress' ).'">';
 							$day = get_post_meta( $event->ID, 'sp_day', true );
 							if ( '' == $day ) {
 								echo '-';
@@ -452,7 +435,7 @@ $identifier = uniqid( 'eventlist_' );
 	<?php
 	// If responsive tables are enabled then load the inline css code
 if ( true == $responsive ){
-	sportspress_responsive_tables_css( $labels, $identifier );
+	sportspress_responsive_tables_css( $identifier );
 }
 	if ( $id && $show_all_events_link )
 		echo '<div class="sp-calendar-link sp-view-all-link"><a href="' . get_permalink( $id ) . '">' . __( 'View all events', 'sportspress' ) . '</a></div>';
diff --git a/templates/event-performance-table.php b/templates/event-performance-table.php
index 228f9bb5..d6deafbe 100644
--- a/templates/event-performance-table.php
+++ b/templates/event-performance-table.php
@@ -20,10 +20,14 @@ if ( ! isset( $class ) ) $class = null;
 // Initialize arrays
 if ( ! isset( $lineups ) ) $lineups = array();
 if ( ! isset( $subs ) ) $subs = array();
+
 $responsive = get_option( 'sportspress_enable_responsive_tables', 'yes' ) == 'yes' ? true : false;
-$rlabels = array();
 //Create a unique identifier based on the current time in microseconds
 $identifier = uniqid( 'performance_' );
+// If responsive tables are enabled then load the inline css code
+if ( true == $responsive && $mode == 'values' ){
+	sportspress_responsive_tables_css( $identifier );
+}
 ?>
 <div class="sp-template sp-template-event-performance sp-template-event-performance-<?php echo $mode; ?><?php if ( isset( $class ) ) { echo ' ' . $class; } ?>">
 	<?php if ( $caption ): ?>
@@ -37,21 +41,19 @@ $identifier = uniqid( 'performance_' );
 						<?php if ( $show_players ): ?>
 							<?php if ( apply_filters( 'sportspress_event_performance_show_numbers', $show_numbers, $section ) ) { ?>
 								<th class="data-number">#</th>
-								<?php $rlabels[] = '#'; ?>
 							<?php } ?>
 							<th class="data-name">
 								<?php if ( isset( $section_label ) ) { ?>
 									<?php echo $section_label; ?>
-									<?php $rlabels[] = $section_label; ?>
+									<?php $player_title = $section_label; ?>
 								<?php } else { ?>
 									<?php _e( 'Player', 'sportspress' ); ?>
-									<?php $rlabels[] = __( 'Player', 'sportspress' ); ?>
+									<?php $player_title = __( 'Player', 'sportspress' ); ?>
 								<?php } ?>
 							</th>
 						<?php endif; ?>
 						<?php foreach ( $labels as $key => $label ): ?>
 							<th class="data-<?php echo $key; ?>"><?php echo $label; ?></th>
-							<?php $rlabels[] = $label; ?>
 						<?php endforeach; ?>
 					<?php endif; ?>
 				</tr>
@@ -92,7 +94,7 @@ $identifier = uniqid( 'performance_' );
 							$number = sp_array_value( $row, 'number', '&nbsp;' );
 
 							// Player number
-							echo '<td class="data-number">' . $number . '</td>';
+							echo '<td class="data-number" data-label="#">' . $number . '</td>';
 						}
 
 						if ( $link_posts ):
@@ -175,7 +177,7 @@ $identifier = uniqid( 'performance_' );
 							endif;
 
 							if ( $mode == 'values' ):
-								$content .= '<td class="data-' . $key . '">' . $value . '</td>';
+								$content .= '<td class="data-' . $key . '" data-label="'.$labels[$key].'">' . $value . '</td>';
 							elseif ( intval( $value ) && $mode == 'icons' ):
 								$performance_id = sp_array_value( $performance_ids, $key, null );
 								$icons = '';
@@ -190,7 +192,7 @@ $identifier = uniqid( 'performance_' );
 							$name .= ' <small class="sp-player-position">' . $position . '</small>';
 						endif;
 
-						echo '<td class="data-name">' . $name . '</td>';
+						echo '<td class="data-name" data-label="'.$player_title.'">' . $name . '</td>';
 
 						if ( $mode == 'icons' ):
 							echo '<td class="sp-performance-icons">' . $content . '</td>';
@@ -216,10 +218,10 @@ $identifier = uniqid( 'performance_' );
 							<?php
 							if ( $show_players ):
 								if ( apply_filters( 'sportspress_event_performance_show_numbers', $show_numbers, $section ) ) {
-									echo '<td class="data-number">&nbsp;</td>';
+									echo '<td class="data-number" data-label="&nbsp;">&nbsp;</td>';
 								}
 								if ( $mode == 'values' ):
-									echo '<td class="data-name">' . __( 'Total', 'sportspress' ) . '</td>';
+									echo '<td class="data-name" data-label="&nbsp;">' . __( 'Total', 'sportspress' ) . '</td>';
 								endif;
 							endif;
 
@@ -243,7 +245,11 @@ $identifier = uniqid( 'performance_' );
 								endif;
 
 								if ( $mode == 'values' ):
-									echo '<td class="data-' . $key . '">' . $value . '</td>';
+									if ($key == 'position'){
+										echo '<td class="data-' . $key . '" data-label="&nbsp;">' . $value . '</td>';
+									}else{
+										echo '<td class="data-' . $key . '" data-label="'.$labels[$key].'">' . $value . '</td>';
+									}
 								elseif ( intval( $value ) && $mode == 'icons' ):
 									$performance_id = sp_array_value( $performance_ids, $key, null );
 									$icons = '';
@@ -264,9 +270,4 @@ $identifier = uniqid( 'performance_' );
 	</div>
 	
 	<?php do_action( 'sportspress_after_event_performance_table', $data, $lineups, $subs, $class ); ?>
-</div>
-<?php
-// If responsive tables are enabled then load the inline css code
-if ( true == $responsive && $mode == 'values' ){
-	sportspress_responsive_tables_css( $rlabels, $identifier );
-}
+</div>
\ No newline at end of file
diff --git a/templates/league-table.php b/templates/league-table.php
index f2499ce3..499a97fc 100644
--- a/templates/league-table.php
+++ b/templates/league-table.php
@@ -66,7 +66,7 @@ $data = $table->data();
 $labels = $data[0];
 // If responsive tables are enabled then load the inline css code
 if ( true == $responsive ){
-	sportspress_responsive_tables_css( $labels, $identifier );
+	sportspress_responsive_tables_css( $identifier );
 }
 // Remove the first row to leave us with the actual data
 unset( $data[0] );
@@ -139,7 +139,7 @@ foreach ( $data as $team_id => $row ):
 	$output .= '<tr class="' . ( $i % 2 == 0 ? 'odd' : 'even' ) . $tr_class . ' sp-row-no-' . $i . '">';
 
 	// Rank
-	$output .= '<td class="data-rank' . $td_class . '">' . sp_array_value( $row, 'pos' ) . '</td>';
+	$output .= '<td class="data-rank' . $td_class . '" data-label="'.$labels['pos'].'">' . sp_array_value( $row, 'pos' ) . '</td>';
 
 	$name_class = '';
 
@@ -156,13 +156,13 @@ foreach ( $data as $team_id => $row ):
 		$name = '<a href="' . $permalink . '">' . $name . '</a>';
 	endif;
 
-	$output .= '<td class="data-name' . $name_class . $td_class . '">' . $name . '</td>';
+	$output .= '<td class="data-name' . $name_class . $td_class . '" data-label="'.$labels['name'].'">' . $name . '</td>';
 
 	foreach( $labels as $key => $value ):
 		if ( in_array( $key, array( 'pos', 'name' ) ) )
 			continue;
 		if ( ! is_array( $columns ) || in_array( $key, $columns ) )
-			$output .= '<td class="data-' . $key . $td_class . '">' . sp_array_value( $row, $key, '&mdash;' ) . '</td>';
+			$output .= '<td class="data-' . $key . $td_class . '" data-label="'.$labels[$key].'">' . sp_array_value( $row, $key, '&mdash;' ) . '</td>';
 	endforeach;
 
 	$output .= '</tr>';
diff --git a/templates/player-list.php b/templates/player-list.php
index d0fdb791..fc72d42e 100644
--- a/templates/player-list.php
+++ b/templates/player-list.php
@@ -56,11 +56,12 @@ $data = $list->data();
 
 // The first row should be column labels
 $labels = $data[0];
+
 //Create a unique identifier based on the current time in microseconds
 $identifier = uniqid( 'playerlist_' );
 // If responsive tables are enabled then load the inline css code
 if ( true == $responsive ){
-	sportspress_responsive_tables_css( $labels, $identifier );
+	sportspress_responsive_tables_css( $identifier );
 }
 // Remove the first row to leave us with the actual data
 unset( $data[0] );
@@ -136,9 +137,9 @@ foreach ( $groups as $group ):
 		// Rank or number
 		if ( ! is_array( $labels ) || array_key_exists( 'number', $labels ) ):
 			if ( isset( $orderby ) && $orderby != 'number' ):
-				$tbody .= '<td class="data-rank">' . ( $i + 1 ) . '</td>';
+				$tbody .= '<td class="data-rank" data-label="'.$labels['number'].'">' . ( $i + 1 ) . '</td>';
 			else:
-				$tbody .= '<td class="data-number">' . sp_array_value( $row, 'number', '&nbsp;' ) . '</td>';
+				$tbody .= '<td class="data-number" data-label="'.$labels['number'].'">' . sp_array_value( $row, 'number', '&nbsp;' ) . '</td>';
 			endif;
 		endif;
 		
@@ -168,7 +169,7 @@ foreach ( $groups as $group ):
 			$name = '<a href="' . $permalink . '">' . $name . '</a>';
 		endif;
 
-		$tbody .= '<td class="data-name' . $name_class . '">' . $name . '</td>';
+		$tbody .= '<td class="data-name' . $name_class . '" data-label="'.$labels['name'].'">' . $name . '</td>';
 		
 		if ( array_key_exists( 'team', $labels ) ):
 			$team = sp_array_value( $row, 'team', get_post_meta( $id, 'sp_team', true ) );
@@ -176,7 +177,7 @@ foreach ( $groups as $group ):
 			if ( $link_teams && false !== get_post_status( $team ) ):
 				$team_name = '<a href="' . get_post_permalink( $team ) . '">' . $team_name . '</a>';
 			endif;
-			$tbody .= '<td class="data-team">' . $team_name . '</td>';
+			$tbody .= '<td class="data-team" data-label="'.$labels['team'].'">' . $team_name . '</td>';
 		endif;
 		
 		if ( array_key_exists( 'position', $labels ) ):
@@ -187,14 +188,14 @@ foreach ( $groups as $group ):
 				$position_term = get_term_by( 'id', $position, 'sp_position', ARRAY_A );
 				$positions = sp_array_value( $position_term, 'name', '&mdash;' );
 			endif;
-			$tbody .= '<td class="data-position">' . $positions . '</td>';
+			$tbody .= '<td class="data-position" data-label="'.$labels['position'].'">' . $positions . '</td>';
 		endif;
 
 		foreach( $labels as $key => $value ):
 			if ( in_array( $key, array( 'number', 'name', 'team', 'position' ) ) )
 				continue;
 			if ( ! is_array( $columns ) || in_array( $key, $columns ) )
-			$tbody .= '<td class="data-' . $key . '">' . sp_array_value( $row, $key, '&mdash;' ) . '</td>';
+			$tbody .= '<td class="data-' . $key . '" data-label="'.$labels[$key].'">' . sp_array_value( $row, $key, '&mdash;' ) . '</td>';
 		endforeach;
 
 		$tbody .= '</tr>';