diff --git a/assets/css/sportspress.css b/assets/css/sportspress.css
index 9b554803..16852d79 100644
--- a/assets/css/sportspress.css
+++ b/assets/css/sportspress.css
@@ -149,6 +149,11 @@
 	cursor: pointer;
 }
 
+/* Event Venue */
+.sp-event-venue thead th {
+	white-space: normal;
+}
+
 /* Event Performance */
 .sp-event-performance .sub-in,
 .sp-event-performance .sub-out {
diff --git a/includes/class-sp-event.php b/includes/class-sp-event.php
index 739dcdc2..2a9cbb75 100644
--- a/includes/class-sp-event.php
+++ b/includes/class-sp-event.php
@@ -5,7 +5,7 @@
  * The SportsPress event class handles individual event data.
  *
  * @class 		SP_Event
- * @version		1.6
+ * @version		1.7
  * @package		SportsPress/Classes
  * @category	Class
  * @author 		ThemeBoy
diff --git a/templates/event-performance.php b/templates/event-performance.php
index 6670e9c4..7f9f0aa8 100644
--- a/templates/event-performance.php
+++ b/templates/event-performance.php
@@ -4,7 +4,7 @@
  *
  * @author 		ThemeBoy
  * @package 	SportsPress/Templates
- * @version     1.6
+ * @version     1.7
  */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
@@ -179,8 +179,8 @@ if ( is_array( $teams ) ):
 	} else {
 		// Combined table
 		?>
+		<h4 class="sp-table-caption"><?php _e( 'Performance', 'sportspress' ); ?></h4>
 		<div class="sp-template sp-template-event-performance sp-template-event-performance-<?php echo $mode; ?>">
-			<h4 class="sp-table-caption"><?php _e( 'Performance', 'sportspress' ); ?></h4>
 			<div class="sp-table-wrapper">
 				<table class="sp-event-performance sp-data-table <?php if ( $scrollable ) { ?> sp-scrollable-table<?php } ?>">
 					<thead>
diff --git a/templates/event-venue.php b/templates/event-venue.php
index 2f880ba3..9f22c9ff 100644
--- a/templates/event-venue.php
+++ b/templates/event-venue.php
@@ -39,18 +39,16 @@ foreach( $venues as $venue ):
 			<thead>
 				<tr>
 					<th><?php echo $name; ?></th>
+					<?php if ( $address != null ) { ?>
+						<th class="sp-event-venue-address-row"><?php echo $address; ?></th>
+					<?php } ?>
 				</tr>
 			</thead>
-			<?php if ( $address != null || ( $show_maps && $latitude != null && $longitude != null ) ): ?>
+			<?php if ( $show_maps && $latitude != null && $longitude != null ): ?>
 				<tbody>
-					<tr class="sp-event-venue-address-row">
-						<td><?php echo $address; ?></td>
+					<tr class="sp-event-venue-map-row">
+						<td<?php if ( $address != null ) { ?> colspan="2"<?php } ?>><?php sp_get_template( 'venue-map.php', array( 'meta' => $meta ) ); ?></td>
 					</tr>
-					<?php if ( $show_maps && $latitude != null && $longitude != null ): ?>
-						<tr class="sp-event-venue-map-row">
-							<td><?php sp_get_template( 'venue-map.php', array( 'meta' => $meta ) ); ?></td>
-						</tr>
-					<?php endif; ?>
 				</tbody>
 			<?php endif; ?>
 		</table>