diff --git a/templates/event-details.php b/templates/event-details.php
index 4225b74b..873ee3ac 100644
--- a/templates/event-details.php
+++ b/templates/event-details.php
@@ -32,8 +32,8 @@ endforeach;
 ?>
 <div class="sp-template sp-template-event-details">
 	<h4 class="sp-table-caption"><?php _e( 'Details', 'sportspress' ); ?></h4>
-	<div class="sp-table-wrapper<?php if ( $scrollable ) { ?> sp-scrollable-table-wrapper<?php } ?>">
-		<table class="sp-event-details sp-data-table">
+	<div class="sp-table-wrapper">
+		<table class="sp-event-details sp-data-table<?php if ( $scrollable ) { ?> sp-scrollable-table<?php } ?>">
 			<thead>
 				<tr>
 					<?php $i = 0; foreach( $data as $label => $value ):	?>
diff --git a/templates/event-list.php b/templates/event-list.php
index 590f0a8b..43137ee5 100644
--- a/templates/event-list.php
+++ b/templates/event-list.php
@@ -60,8 +60,8 @@ if ( $id ) {
 }
 ?>
 <div class="sp-template sp-template-event-list">
-	<div class="sp-table-wrapper<?php if ( $scrollable ) { ?> sp-scrollable-table-wrapper<?php } ?>">
-		<table class="sp-event-list sp-data-table<?php if ( $responsive ) { ?> sp-responsive-table<?php } if ( $paginated ) { ?> sp-paginated-table<?php } if ( $sortable ) { ?> sp-sortable-table<?php } ?>" data-sp-rows="<?php echo $rows; ?>">
+	<div class="sp-table-wrapper">
+		<table class="sp-event-list sp-data-table<?php if ( $responsive ) { ?> sp-responsive-table<?php } if ( $paginated ) { ?> sp-paginated-table<?php } if ( $sortable ) { ?> sp-sortable-table<?php } if ( $scrollable ) { ?> sp-scrollable-table<?php } ?>" data-sp-rows="<?php echo $rows; ?>">
 			<thead>
 				<tr>
 					<?php
diff --git a/templates/event-performance.php b/templates/event-performance.php
index deda1f16..9a1d84cc 100644
--- a/templates/event-performance.php
+++ b/templates/event-performance.php
@@ -79,8 +79,8 @@ if ( is_array( $teams ) ):
 			endif;
 			?>
 			<?php if ( $show_team_players || $show_total ): ?>
-				<div class="sp-table-wrapper<?php if ( $scrollable ) { ?> sp-scrollable-table-wrapper<?php } ?>">
-					<table class="sp-event-performance sp-data-table <?php if ( $responsive ) { ?> sp-responsive-table<?php } ?>">
+				<div class="sp-table-wrapper">
+					<table class="sp-event-performance sp-data-table <?php if ( $responsive ) { ?> sp-responsive-table<?php } if ( $scrollable ) { ?> sp-scrollable-table<?php } ?>">
 						<thead>
 							<tr>
 								<?php if ( $show_team_players ): ?>
diff --git a/templates/event-results.php b/templates/event-results.php
index cbdac8f6..11256268 100644
--- a/templates/event-results.php
+++ b/templates/event-results.php
@@ -97,8 +97,8 @@ else:
 
 	$output .= '<h4 class="sp-table-caption">' . __( 'Team Results', 'sportspress' ) . '</h4>';
 
-	$output .= '<div class="sp-table-wrapper' . ( $scrollable ? ' sp-scrollable-table-wrapper' : '' ) . '">' .
-		'<table class="sp-event-results sp-data-table sp-responsive-table"><thead>' .
+	$output .= '<div class="sp-table-wrapper">' .
+		'<table class="sp-event-results sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . ( $scrollable ? ' sp-scrollable-table' : '' ) . '"><thead>' .
 		'<th class="data-name">' . __( 'Team', 'sportspress' ) . '</th>';
 	foreach( $labels as $key => $label ):
 		$output .= '<th class="data-' . $key . '">' . $label . '</th>';
diff --git a/templates/league-table.php b/templates/league-table.php
index ce1555a1..15b11ebe 100644
--- a/templates/league-table.php
+++ b/templates/league-table.php
@@ -30,9 +30,9 @@ if ( ! isset( $highlight ) ) $highlight = get_post_meta( $id, 'sp_highlight', tr
 
 $output = '<h4 class="sp-table-caption">' . get_the_title( $id ) . '</h4>';
 
-$output .= '<div class="sp-table-wrapper' . ( $scrollable ? ' sp-scrollable-table-wrapper' : '' ) . '">';
+$output .= '<div class="sp-table-wrapper">';
 
-$output .= '<table class="sp-league-table sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . ( $sortable ? ' sp-sortable-table' : '' ) . ( $paginated ? ' sp-paginated-table' : '' ) . '" data-sp-rows="' . $rows . '">' . '<thead>' . '<tr>';
+$output .= '<table class="sp-league-table sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . ( $sortable ? ' sp-sortable-table' : '' ) . ( $scrollable ? ' sp-scrollable-table' : '' ) . ( $paginated ? ' sp-paginated-table' : '' ) . '" data-sp-rows="' . $rows . '">' . '<thead>' . '<tr>';
 
 $table = new SP_League_Table( $id );
 
diff --git a/templates/player-list.php b/templates/player-list.php
index a7a27bcd..9b4a997a 100644
--- a/templates/player-list.php
+++ b/templates/player-list.php
@@ -85,8 +85,8 @@ foreach ( $groups as $group ):
 		$output .= '<' . $grouptag . ' class="sp-table-caption player-group-name player-list-group-name">' . $group->name . '</' . $grouptag . '>';
 	endif;
 
-	$output .= '<div class="sp-table-wrapper' . ( $scrollable ? ' sp-scrollable-table-wrapper' : '' ) . '">' .
-		'<table class="sp-player-list sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . ( $sortable ? ' sp-sortable-table' : '' ) . ( $paginated ? ' sp-paginated-table' : '' ) . '" data-sp-rows="' . $rows . '">' . '<thead>' . '<tr>';
+	$output .= '<div class="sp-table-wrapper">' .
+		'<table class="sp-player-list sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . ( $sortable ? ' sp-sortable-table' : '' ) . ( $scrollable ? ' sp-scrollable-table' : '' ) . ( $paginated ? ' sp-paginated-table' : '' ) . '" data-sp-rows="' . $rows . '">' . '<thead>' . '<tr>';
 
 	if ( ! is_array( $labels ) || array_key_exists( 'number', $labels ) ):
 		if ( in_array( $orderby, array( 'number', 'name' ) ) ):
diff --git a/templates/player-statistics.php b/templates/player-statistics.php
index 56a2baea..25bd8da3 100644
--- a/templates/player-statistics.php
+++ b/templates/player-statistics.php
@@ -35,8 +35,8 @@ if ( is_array( $leagues ) ):
 			continue;
 
 		$output = '<h4 class="sp-table-caption">' . $league->name . '</h4>' .
-			'<div class="sp-table-wrapper' . ( $scrollable ? ' sp-scrollable-table-wrapper' : '' ) . '">' .
-			'<table class="sp-player-statistics sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . '">' . '<thead>' . '<tr>';
+			'<div class="sp-table-wrapper">' .
+			'<table class="sp-player-statistics sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . ( $scrollable ? ' sp-scrollable-table' : '' ) . '">' . '<thead>' . '<tr>';
 
 		foreach( $labels as $key => $label ):
 			$output .= '<th class="data-' . $key . '">' . $label . '</th>';
@@ -83,8 +83,8 @@ if ( $show_total ):
 		return false;
 
 	$output = '<h4 class="sp-table-caption">' . __( 'Career Total', 'sportspress' ) . '</h4>' .
-		'<div class="sp-table-wrapper' . ( $scrollable ? ' sp-scrollable-table-wrapper' : '' ) . '">' .
-		'<table class="sp-player-statistics sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . '">' . '<thead>' . '<tr>';
+		'<div class="sp-table-wrapper">' .
+		'<table class="sp-player-statistics sp-data-table' . ( $responsive ? ' sp-responsive-table' : '' ) . ( $scrollable ? ' sp-scrollable-table' : '' ) . '">' . '<thead>' . '<tr>';
 
 	foreach( $labels as $key => $label ):
 		if ( 'team' == $key )