diff --git a/templates/event-list.php b/templates/event-list.php
index 08c820a5..cef6a32c 100644
--- a/templates/event-list.php
+++ b/templates/event-list.php
@@ -59,7 +59,6 @@ endif;
 					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:
@@ -67,8 +66,15 @@ endif;
 						endif;
 					endif;
 
-					if ( $usecolumns == null || in_array( 'time', $usecolumns ) )
-						echo '<th class="data-time">' . __( 'Time/Results', 'sportspress' ) . '</th>';
+					if ( $usecolumns == null || in_array( 'time', $usecolumns ) ):
+						if ( $usecolumns == null || in_array( 'event', $usecolumns ) && $title_format == 'homeaway' )
+							echo '<th class="data-time">&nbsp;</th>';
+						else
+							echo '<th class="data-time">' . __( 'Time/Results', 'sportspress' ) . '</th>';
+					endif;
+
+					if ( $usecolumns == null || in_array( 'event', $usecolumns ) && $title_format == 'homeaway' )
+						echo '<th class="data-away">' . __( 'Away', 'sportspress' ) . '</th>';
 
 					if ( $usecolumns == null || in_array( 'league', $usecolumns ) )
 						echo '<th class="data-league">' . __( 'League', 'sportspress' ) . '</th>';
@@ -127,7 +133,9 @@ endif;
 
 								if ( $team_result != null ):
 									$main_results[] = $team_result;
-									$team_output .= ' (' . $team_result . ')';
+									if ( $usecolumns != null && ! in_array( 'time', $usecolumns ) ):
+										$team_output .= ' (' . $team_result . ')';
+									endif;
 								endif;
 
 								$teams_array[] = $team_output;
@@ -147,8 +155,6 @@ endif;
 							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>';
@@ -168,6 +174,11 @@ endif;
 							echo '</a></td>';
 						endif;
 
+						if ( $usecolumns == null || in_array( 'event', $usecolumns ) && $title_format == 'homeaway' ):
+							$team = array_shift( $teams_array );
+							echo '<td class="data-away">' . $team . '</td>';
+						endif;
+
 						if ( $usecolumns == null || in_array( 'league', $usecolumns ) ):
 							echo '<td class="data-league">';
 							$leagues = get_the_terms( $event->ID, 'sp_league' );