diff --git a/includes/sp-core-functions.php b/includes/sp-core-functions.php
index 52bb9ee6..d2598a30 100644
--- a/includes/sp-core-functions.php
+++ b/includes/sp-core-functions.php
@@ -75,12 +75,8 @@ function sp_get_template( $template_name, $args = array(), $template_path = '',
 
 	do_action( 'sportspress_before_template_part', $template_name, $template_path, $located, $args );
 
-	echo '<div class="sp-template sp-template-' . str_replace( '.', '-', $template_name ) . '">';
-
 	include( $located );
 
-	echo '</div>';
-
 	do_action( 'sportspress_after_template_part', $template_name, $template_path, $located, $args );
 }
 
diff --git a/templates/event-details.php b/templates/event-details.php
index 95e98926..bf3f3176 100644
--- a/templates/event-details.php
+++ b/templates/event-details.php
@@ -29,7 +29,7 @@ if ( $seasons ):
 	$data[ __( 'Season', 'sportspress' ) ] = $season->name;
 endif;
 ?>
-<h3><?php _e( 'Details', 'sportspress' ); ?></h3>
+<h4 class="sp-table=caption"><?php _e( 'Details', 'sportspress' ); ?></h4>
 <div class="sp-table-wrapper sp-scrollable-table-wrapper">
 	<table class="sp-event-details sp-data-table">
 		<thead>
diff --git a/templates/event-performance.php b/templates/event-performance.php
index 8daefd16..4d127887 100644
--- a/templates/event-performance.php
+++ b/templates/event-performance.php
@@ -44,7 +44,7 @@ foreach( $teams as $index => $team_id ):
 
 	$data = sp_array_combine( $players, sp_array_value( $performance, $team_id, array() ) );
 	?>
-	<h3><?php echo get_the_title( $team_id ); ?></h3>
+	<h4 class="sp-table=caption"><?php echo get_the_title( $team_id ); ?></h4>
 	<?php
 	if ( get_option( 'sportspress_event_show_staff', 'yes' ) == 'yes' ):
 		sp_get_template( 'event-staff.php', array( 'id' => $id, 'index' => $index ) );
diff --git a/templates/event-results.php b/templates/event-results.php
index 000d9aa7..587c90fc 100644
--- a/templates/event-results.php
+++ b/templates/event-results.php
@@ -86,7 +86,7 @@ if ( empty( $table_rows ) ):
 
 else:
 
-	$output .= '<h3>' . __( 'Team Results', 'sportspress' ) . '</h3>';
+	$output .= '<h4 class="sp-table=caption">' . __( 'Team Results', 'sportspress' ) . '</h4>';
 
 	$output .= '<div class="sp-table-wrapper sp-scrollable-table-wrapper">' .
 		'<table class="sp-event-results sp-data-table sp-responsive-table"><thead>' .
diff --git a/templates/event-venue.php b/templates/event-venue.php
index b04df126..918ed620 100644
--- a/templates/event-venue.php
+++ b/templates/event-venue.php
@@ -32,7 +32,7 @@ foreach( $venues as $venue ):
 	$latitude = sp_array_value( $meta, 'sp_latitude', 0 );
 	$longitude = sp_array_value( $meta, 'sp_longitude', 0 );
 	?>
-	<h3><?php _e( 'Venue', 'sportspress' ); ?></h3>
+	<h4 class="sp-table=caption"><?php _e( 'Venue', 'sportspress' ); ?></h4>
 	<table class="sp-data-table sp-event-venue">
 		<thead>
 			<tr>