diff --git a/assets/css/sportspress.css b/assets/css/sportspress.css
index 2ddde8d4..d6df71a3 100644
--- a/assets/css/sportspress.css
+++ b/assets/css/sportspress.css
@@ -54,11 +54,19 @@
 /* Google Maps */
 .sp-google-map {
 	height: 320px;
-	margin-bottom: 32px;
 }
 .sp-google-map img {
 	max-width: none !important;
 }
+.sp-venue-map {
+	margin-bottom: 4em;
+}
+
+/* Templates */
+.sp-view-all-link {
+	display: block;
+	margin-top: 0.5em;
+}
 
 @media only screen and (max-width: 40em) {
 	.sp-responsive-table {
diff --git a/includes/sp-template-hooks.php b/includes/sp-template-hooks.php
index d0b2f1f4..160bd778 100644
--- a/includes/sp-template-hooks.php
+++ b/includes/sp-template-hooks.php
@@ -62,7 +62,7 @@ function sportspress_default_venue_content( $query ) {
     $longitude = sp_array_value( $venue_meta, 'sp_longitude', null );
 
     if ( $latitude != null && $longitude != null )
-        echo '<div class="sp-google-map" data-address="' . $address . '" data-latitude="' . $latitude . '" data-longitude="' . $longitude . '"></div>';
+        echo '<div class="sp-google-map sp-venue-map" data-address="' . $address . '" data-latitude="' . $latitude . '" data-longitude="' . $longitude . '"></div>';
 }
 add_action( 'loop_start', 'sportspress_default_venue_content' );
 
diff --git a/templates/event-calendar.php b/templates/event-calendar.php
index 8f9ed114..d924ba0b 100644
--- a/templates/event-calendar.php
+++ b/templates/event-calendar.php
@@ -195,6 +195,6 @@ if ( $pad != 0 && $pad != 7 )
 $calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>\n\t</div>";
 
 if ( $id && $show_all_events_link )
-	$calendar_output .= '<a class="sp-calendar-link" href="' . get_permalink( $id ) . '">' . SP()->text->string('View all events', 'event') . '</a>';
+	$calendar_output .= '<a class="sp-calendar-link sp-view-all-link" href="' . get_permalink( $id ) . '">' . SP()->text->string('View all events', 'event') . '</a>';
 
 echo apply_filters( 'sportspress_event_calendar',  $calendar_output );
diff --git a/templates/event-list.php b/templates/event-list.php
index 804a75ec..57d23f28 100644
--- a/templates/event-list.php
+++ b/templates/event-list.php
@@ -134,6 +134,6 @@ extract( $defaults, EXTR_SKIP );
 	</table>
 	<?php
 	if ( $id && $show_all_events_link )
-		echo '<a class="sp-calendar-link" href="' . get_permalink( $id ) . '">' . SP()->text->string('View all events', 'event') . '</a>';
+		echo '<a class="sp-calendar-link sp-view-all-link" href="' . get_permalink( $id ) . '">' . SP()->text->string('View all events', 'event') . '</a>';
 	?>
 </div>
\ No newline at end of file
diff --git a/templates/event-venue.php b/templates/event-venue.php
index 2495a372..d6b811a5 100644
--- a/templates/event-venue.php
+++ b/templates/event-venue.php
@@ -4,25 +4,36 @@ if ( ! isset( $id ) )
 
 $venues = get_the_terms( $id, 'sp_venue' );
 
-$output = '';
+$show_map = get_option( 'sportspress_event_show_map', 'yes' ) == 'yes' ? true : false;
 
 if ( ! $venues )
 	return $output;
 
 foreach( $venues as $venue ):
-
 	$t_id = $venue->term_id;
 	$term_meta = get_option( "taxonomy_$t_id" );
 
 	$address = sp_array_value( $term_meta, 'sp_address', '' );
 	$latitude = sp_array_value( $term_meta, 'sp_latitude', 0 );
 	$longitude = sp_array_value( $term_meta, 'sp_longitude', 0 );
-
-	$output .= '<h3>' . SP()->text->string('Venue', 'event') . '</h3>';
-	$output .= '<p><a href="' . get_term_link( $t_id, 'sp_venue' ) . '">' . $venue->name . '</a><br><small>' . $address . '</small></p>';
-	if ( $latitude != null && $longitude != null )
-		$output .= '<div class="sp-google-map" data-address="' . $address . '" data-latitude="' . $latitude . '" data-longitude="' . $longitude . '"></div>';
-
+	?>
+	<h3><?php echo SP()->text->string('Venue', 'event'); ?></h3>
+	<table class="sp-data-table sp-event-venue">
+		<thead>
+			<tr>
+				<th><a href="<?php echo get_term_link( $t_id, 'sp_venue' ); ?>"><?php echo $venue->name; ?></a></th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td><?php echo $address; ?></td>
+			</tr>
+			<?php if ( $show_map && $latitude != null && $longitude != null ): ?>
+				<tr>
+					<td><div class="sp-google-map" data-address="<?php echo $address; ?>" data-latitude="<?php echo $latitude; ?>" data-longitude="<?php echo $longitude; ?>"></div></td>
+				</tr>
+			<?php endif; ?>
+		</tbody>
+	</table>
+	<?php
 endforeach;
-
-echo apply_filters( 'sportspress_event_venue',  $output );
diff --git a/templates/league-table.php b/templates/league-table.php
index 62724eae..62c26600 100644
--- a/templates/league-table.php
+++ b/templates/league-table.php
@@ -81,7 +81,7 @@ endforeach;
 $output .= '</tbody>' . '</table>';
 
 if ( $show_full_table_link )
-	$output .= '<a class="sp-league-table-link" href="' . get_permalink( $id ) . '">' . SP()->text->string('View full table', 'team') . '</a>';
+	$output .= '<a class="sp-league-table-link sp-view-all-link" href="' . get_permalink( $id ) . '">' . SP()->text->string('View full table', 'team') . '</a>';
 
 $output .= '</div>';
 
diff --git a/templates/player-gallery.php b/templates/player-gallery.php
index b1aa9923..7800cdb0 100644
--- a/templates/player-gallery.php
+++ b/templates/player-gallery.php
@@ -121,6 +121,6 @@ $output .= "
 	</div>\n";
 
 if ( $show_all_players_link )
-	$output .= '<a class="sp-player-list-link" href="' . get_permalink( $id ) . '">' . SP()->text->string('View all players', 'player') . '</a>';
+	$output .= '<a class="sp-player-list-link sp-view-all-link" href="' . get_permalink( $id ) . '">' . SP()->text->string('View all players', 'player') . '</a>';
 
 echo apply_filters( 'sportspress_player_gallery',  $output );
diff --git a/templates/player-list.php b/templates/player-list.php
index 12fbf0ab..0cf40130 100644
--- a/templates/player-list.php
+++ b/templates/player-list.php
@@ -95,6 +95,6 @@ endforeach;
 $output .= '</tbody>' . '</table>' . '</div>';
 
 if ( $show_all_players_link )
-	$output .= '<a class="sp-player-list-link" href="' . get_permalink( $id ) . '">' . SP()->text->string('View all players', 'player') . '</a>';
+	$output .= '<a class="sp-player-list-link sp-view-all-link" href="' . get_permalink( $id ) . '">' . SP()->text->string('View all players', 'player') . '</a>';
 
 echo apply_filters( 'sportspress_player_list',  $output );