diff --git a/assets/js/admin/sportspress-admin.js b/assets/js/admin/sportspress-admin.js
index 455ced27..52bf2eec 100644
--- a/assets/js/admin/sportspress-admin.js
+++ b/assets/js/admin/sportspress-admin.js
@@ -135,6 +135,12 @@ jQuery(document).ready(function($){
 		$(".sp-dummy."+name+"-dummy").val(val).trigger("change");
 	});
 
+	// Title format switcher
+	$(".sp-title-format-select").change(function() {
+		val = $(this).val();
+		$(".sp-title-format").hide().filter(".sp-title-format-"+val).show();
+	});
+
 	// Custom value editor
 	$(".sp-data-table .sp-default-value").click(function() {
 		$(this).hide().siblings(".sp-custom-value").show().find(".sp-custom-value-input").focus();
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php
index e038c606..fdd49066 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-data.php
@@ -22,20 +22,22 @@ class SP_Meta_Box_Calendar_Data {
 		$calendar = new SP_Calendar( $post );
 		$data = $calendar->data();
 		$usecolumns = $calendar->columns;
-		self::table( $data, $usecolumns );
+		$title_format = $calendar->title_format;
+		self::table( $data, $usecolumns, $title_format );
 	}
 
 	/**
 	 * Save meta box data
 	 */
 	public static function save( $post_id, $post ) {
+		update_post_meta( $post_id, 'sp_title_format', sp_array_value( $_POST, 'sp_title_format', 'title' ) );
 		update_post_meta( $post_id, 'sp_columns', sp_array_value( $_POST, 'sp_columns', array() ) );
 	}
 
 	/**
 	 * Admin edit table
 	 */
-	public static function table( $data = array(), $usecolumns = null ) {
+	public static function table( $data = array(), $usecolumns = null, $title_format = null ) {
 		if ( is_array( $usecolumns ) )
 			$usecolumns = array_filter( $usecolumns );
 		?>
@@ -49,13 +51,11 @@ class SP_Meta_Box_Calendar_Data {
 						<th class="column-event">
 							<label for="sp_columns_event">
 								<input type="checkbox" name="sp_columns[]" value="event" id="sp_columns_event" <?php checked( ! is_array( $usecolumns ) || in_array( 'event', $usecolumns ) ); ?>>
-								<?php _e( 'Event', 'sportspress' ); ?>
-							</label>
-						</th>
-						<th class="column-teams">
-							<label for="sp_columns_teams">
-								<input type="checkbox" name="sp_columns[]" value="teams" id="sp_columns_teams" <?php checked( ! is_array( $usecolumns ) || in_array( 'teams', $usecolumns ) ); ?>>
-								<?php _e( 'Teams', 'sportspress' ); ?>
+								<select name="sp_title_format" class="sp-title-format-select">
+									<option value="title" <?php selected( $title_format, 'title' ); ?>><?php _e( 'Title', 'sportspress' ); ?></option>
+									<option value="teams" <?php selected( $title_format, 'teams' ); ?>><?php _e( 'Teams', 'sportspress' ); ?></option>
+									<option value="homeaway" <?php selected( $title_format, 'homeaway' ); ?>><?php _e( 'Home', 'sportspress' ); ?> | <?php _e( 'Away', 'sportspress' ); ?></option>
+								</select>
 							</label>
 						</th>
 						<th class="column-time">
@@ -92,38 +92,40 @@ class SP_Meta_Box_Calendar_Data {
 								?>
 								<tr class="sp-row sp-post<?php if ( $i % 2 == 0 ) echo ' alternate'; ?>">
 									<td><?php echo get_post_time( get_option( 'date_format' ), false, $event, true ); ?></td>
-									<td><?php echo $event->post_title; ?></td>
 									<td>
-										<?php
-										if ( $teams ): foreach ( $teams as $team ):
-											$name = get_the_title( $team );
-											if ( $name ):
-												$team_results = sp_array_value( $results, $team, null );
+										<div class="sp-title-format sp-title-format-title<?php if ( $title_format != 'title' ): ?> hidden<?php endif; ?>"><?php echo $event->post_title; ?></div>
+										<div class="sp-title-format sp-title-format-teams sp-title-format-homeaway<?php if ( ! in_array( $title_format, array( 'teams', 'homeaway' ) ) ): ?> hidden<?php endif; ?>">
+											<?php
+											if ( $teams ): foreach ( $teams as $team ):
+												$name = get_the_title( $team );
+												if ( $name ):
+													$team_results = sp_array_value( $results, $team, null );
 
-												if ( $main_result ):
-													$team_result = sp_array_value( $team_results, $main_result, null );
-												else:
-													if ( is_array( $team_results ) ):
-														end( $team_results );
-														$team_result = prev( $team_results );
+													if ( $main_result ):
+														$team_result = sp_array_value( $team_results, $main_result, null );
 													else:
-														$team_result = null;
+														if ( is_array( $team_results ) ):
+															end( $team_results );
+															$team_result = prev( $team_results );
+														else:
+															$team_result = null;
+														endif;
 													endif;
-												endif;
 
-												if ( $team_result != null ):
-													$main_results[] = $team_result;
-													unset( $team_results['outcome'] );
-													$team_results = implode( ' | ', $team_results );
-													echo '<a class="result tips" title="' . $team_results . '" href="' . get_edit_post_link( $event->ID ) . '">' . $team_result . '</a> ';
-												endif;
+													if ( $team_result != null ):
+														$main_results[] = $team_result;
+														unset( $team_results['outcome'] );
+														$team_results = implode( ' | ', $team_results );
+														echo '<a class="result tips" title="' . $team_results . '" href="' . get_edit_post_link( $event->ID ) . '">' . $team_result . '</a> ';
+													endif;
 
-												echo $name . '<br>';
+													echo $name . '<br>';
+												endif;
+											endforeach; else:
+												echo '&mdash;';
 											endif;
-										endforeach; else:
-											echo '&mdash;';
-										endif;
-										?>
+											?>
+										</div>
 									</td>
 									<td>
 										<?php
diff --git a/templates/event-details.php b/templates/event-details.php
index 81b8ee29..53b70ac4 100644
--- a/templates/event-details.php
+++ b/templates/event-details.php
@@ -21,12 +21,12 @@ $seasons = get_the_terms( $id, 'sp_season' );
 $data = array( __( 'Date', 'sportspress' ) => $date, __( 'Time', 'sportspress' ) => $time );
 
 if ( $leagues ):
-	$league = array_pop( $leagues );
+	$league = array_shift( $leagues );
 	$data[ __( 'League', 'sportspress' ) ] = $league->name;
 endif;
 
 if ( $seasons ):
-	$season = array_pop( $seasons );
+	$season = array_shift( $seasons );
 	$data[ __( 'Season', 'sportspress' ) ] = $season->name;
 endif;
 ?>
diff --git a/templates/event-list.php b/templates/event-list.php
index feadcf17..8f01e26d 100644
--- a/templates/event-list.php
+++ b/templates/event-list.php
@@ -39,6 +39,7 @@ if ( $order != 'default' )
 	$calendar->order = $order;
 $data = $calendar->data();
 $usecolumns = $calendar->columns;
+$title_format = $calendar->title_format;
 
 if ( isset( $columns ) ):
 	if ( is_array( $columns ) )
@@ -55,11 +56,16 @@ endif;
 					<?php
 					echo '<th class="data-date">' . __( 'Date', 'sportspress' ) . '</th>';
 
-					if ( $usecolumns == null || in_array( 'event', $usecolumns ) )
-						echo '<th class="data-event">' . __( 'Event', 'sportspress' ) . '</th>';
-
-					if ( $usecolumns == null || in_array( 'teams', $usecolumns ) )
-						echo '<th class="data-teams">' . __( 'Teams', 'sportspress' ) . '</th>';
+					if ( $usecolumns == null || in_array( 'event', $usecolumns ) ):
+						if ( $title_format == 'homeaway' ):
+							echo '<th class="data-home">' . __( 'Home', 'sportspress' ) . '</th>';
+							echo '<th class="data-away">' . __( 'Away', 'sportspress' ) . '</th>';
+						elseif ( $title_format == 'teams' ):
+							echo '<th class="data-teams">' . __( 'Teams', 'sportspress' ) . '</th>';
+						else:
+							echo '<th class="data-event">' . __( 'Event', 'sportspress' ) . '</th>';
+						endif;
+					endif;
 
 					if ( $usecolumns == null || in_array( 'time', $usecolumns ) )
 						echo '<th class="data-time">' . __( 'Time/Results', 'sportspress' ) . '</th>';
@@ -88,6 +94,7 @@ endif;
 
 					$main_results = array();
 					$teams_output = '';
+					$teams_array = '';
 
 					if ( $teams ):
 						foreach ( $teams as $team ):
@@ -107,17 +114,19 @@ endif;
 								endif;
 
 								if ( $link_teams ):
-									$teams_output .= '<a href="' . get_post_permalink( $team ) . '">' . $name . '</a>';
+									$team_output = '<a href="' . get_post_permalink( $team ) . '">' . $name . '</a>';
 								else:
-									$teams_output .= $name;
+									$team_output = $name;
 								endif;
 
 								if ( $team_result != null ):
 									$main_results[] = $team_result;
-									$teams_output .= ' (' . $team_result . ')';
+									$team_output .= ' (' . $team_result . ')';
 								endif;
 
-								$teams_output .= '<br>';
+								$teams_array[] = $team_output;
+
+								$teams_output .= $team_output . '<br>';
 							endif;
 						endforeach;
 					else:
@@ -128,58 +137,64 @@ endif;
 
 						echo '<td class="data-date"><a href="' . get_permalink( $event->ID ) . '">' . get_post_time( get_option( 'date_format' ), false, $event, true ) . '</a></td>';
 
-						if ( $usecolumns == null || in_array( 'event', $usecolumns ) )
-							echo '<td class="data-event">' . $event->post_title . '</td>';
+						if ( $usecolumns == null || in_array( 'event', $usecolumns ) ):
+							if ( $title_format == 'homeaway' ):
+								$team = array_shift( $teams_array );
+								echo '<td class="data-home">' . $team . '</td>';
+								$team = array_shift( $teams_array );
+								echo '<td class="data-away">' . $team . '</td>';
+							else:
+								if ( $title_format == 'teams' ):
+									echo '<td class="data-event">' . $teams_output . '</td>';
+								else:
+									echo '<td class="data-event"><a href="' . get_permalink( $event->ID ) . '">' . $event->post_title . '</a></td>';
+								endif;
+							endif;
+						endif;
 
-						if ( $usecolumns == null || in_array( 'teams', $usecolumns ) ):
-							echo '<td class="data-teams">';
-								echo $teams_output;
+						if ( $usecolumns == null || in_array( 'time', $usecolumns ) ):
+							echo '<td class="data-time"><a href="' . get_permalink( $event->ID ) . '">';
+							if ( ! empty( $main_results ) ):
+								echo implode( ' - ', $main_results );
+							else:
+								echo get_post_time( get_option( 'time_format' ), false, $event, true );
+							endif;
+							echo '</a></td>';
+						endif;
+
+						if ( $usecolumns == null || in_array( 'venue', $usecolumns ) ):
+							echo '<td class="data-venue">';
+							if ( $link_venues ):
+								the_terms( $event->ID, 'sp_venue' );
+							else:
+								$venues = get_the_terms( $event->ID, 'sp_venue' );
+								foreach ( $venues as $venue ):
+									echo $venue->name;
+								endforeach;
+							endif;
 							echo '</td>';
 						endif;
 
-					if ( $usecolumns == null || in_array( 'time', $usecolumns ) ):
-						echo '<td class="data-time">';
-						if ( ! empty( $main_results ) ):
-							echo implode( ' - ', $main_results );
-						else:
-							echo get_post_time( get_option( 'time_format' ), false, $event, true );
-						endif;
-						echo '</td>';
-					endif;
+						if ( $usecolumns == null || in_array( 'article', $usecolumns ) ):
+							echo '<td class="data-article">
+								<a href="' . get_permalink( $event->ID ) . '">';
 
-					if ( $usecolumns == null || in_array( 'venue', $usecolumns ) ):
-						echo '<td class="data-venue">';
-						if ( $link_venues ):
-							the_terms( $event->ID, 'sp_venue' );
-						else:
-							$venues = get_the_terms( $event->ID, 'sp_venue' );
-							foreach ( $venues as $venue ):
-								echo $venue->name;
-							endforeach;
-						endif;
-						echo '</td>';
-					endif;
-
-					if ( $usecolumns == null || in_array( 'article', $usecolumns ) ):
-						echo '<td class="data-article">
-							<a href="' . get_permalink( $event->ID ) . '">';
-
-							if ( $video ):
-								echo '<div class="dashicons dashicons-video-alt"></div>';
-							elseif ( has_post_thumbnail( $event->ID ) ):
-								echo '<div class="dashicons dashicons-camera"></div>';
-							endif;
-							if ( $event->post_content !== null ):
-								if ( $event->post_status == 'publish' ):
-									_e( 'Recap', 'sportspress' );
-								else:
-									_e( 'Preview', 'sportspress' );
+								if ( $video ):
+									echo '<div class="dashicons dashicons-video-alt"></div>';
+								elseif ( has_post_thumbnail( $event->ID ) ):
+									echo '<div class="dashicons dashicons-camera"></div>';
+								endif;
+								if ( $event->post_content !== null ):
+									if ( $event->post_status == 'publish' ):
+										_e( 'Recap', 'sportspress' );
+									else:
+										_e( 'Preview', 'sportspress' );
+									endif;
 								endif;
-							endif;
 
-							echo '</a>
-						</td>';
-					endif;
+								echo '</a>
+							</td>';
+						endif;
 
 					echo '</tr>';