--- a/trip.php
+++ b/trip.php
@@ -1,40 +1,42 @@
 <?php
 include ('include/common.inc.php');
-
 $routetrips = Array();
-
 if (isset($routeid) && !isset($tripid)) {
-    $trip = getRouteNextTrip($routeid);
-    $tripid = $trip['trip_id'];
-} else {
-    $trip = getTrip($tripid);
-    $routeid = $trip["route_id"];
+	$trip = getRouteNextTrip($routeid);
+	$tripid = $trip['trip_id'];
 }
-
+else {
+	$trip = getTrip($tripid);
+	$routeid = $trip["route_id"];
+}
 $routetrips = getRouteTrips($routeid);
-    
 include_header("Stops on " . $trip['route_short_name'] . ' ' . $trip['route_long_name'], "trip");
-trackEvent("Route/Trip View","View Route",  $trip['route_short_name'] . ' ' . $trip['route_long_name'], $routeid);
-
-echo '<span id="leftcolumn">';
-echo '<a href="'.$trip['route_url'].'">View Original Timetable/Map</a>';
+trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $trip['route_long_name'], $routeid);
+echo '<span class="content-secondary">';
+echo '<a href="' . $trip['route_url'] . '">View Original Timetable/Map</a>';
 echo '<h2>Via:</h2> <small>' . viaPointNames($tripid) . '</small>';
 echo '<h2>Other Trips:</h2> ';
 foreach (getRouteTrips($routeid) as $othertrip) {
-	echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&amp;routeid=" . $routeid . '">' . str_replace("  ",":00",str_replace(":00"," ",$othertrip['arrival_time'])). '</a> ';
+	echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&amp;routeid=" . $routeid . '">' . str_replace("  ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> ';
 }
-flush(); @ob_flush();
+flush();
+@ob_flush();
 echo '<h2>Other directions/timing periods:</h2> ';
+$otherDir = 0;
 foreach (getRoutesByNumber($trip['route_short_name']) as $row) {
-	if ($row['route_id'] != $routeid) echo '<a href="trip.php?routeid=' . $row['route_id'] . '">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> ';
+	if ($row['route_id'] != $routeid) {
+		echo '<a href="trip.php?routeid=' . $row['route_id'] . '">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> ';
+		$otherDir++;
+	}
 }
-echo '</span><span id="rightcolumn">';
-flush(); @ob_flush();
+if ($otherDir == 0) echo "None";
+echo '</span><span class="content-primary">';
+flush();
+@ob_flush();
 echo '  <ul data-role="listview"  data-inset="true">';
 $stopsGrouped = Array();
 $tripStopTimes = getTimeInterpolatedTrip($tripid);
-echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trip['route_long_name'] . ' (' . ucwords($tripStopTimes[0]['service_id']).')</li>';
-
+echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trip['route_long_name'] . ' (' . ucwords($tripStopTimes[0]['service_id']) . ')</li>';
 foreach ($tripStopTimes as $key => $tripStopTime) {
 	if (($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"]) || $key + 1 >= sizeof($tripStopTimes)) {
 		echo '<li>';
@@ -46,27 +48,28 @@
 			$stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
 			echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
 			echo '<p class="ui-li-aside">' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'];
-                        
-                        if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
-						echo '<br>' . distance($tripStopTime['stop_lat'],$tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
-					}
-                                        echo '</p>';
+			if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+				echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+			}
+			echo '</p>';
 			echo bracketsMeanNewLine($tripStopTime["stop_name"]);
 			echo '</a></li>';
-                        flush(); @ob_flush();
+			flush();
+			@ob_flush();
 			$stopsGrouped = Array();
 		}
 		else {
 			// just a normal stop
 			echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&amp;stopcode=' . $tripStopTime['stop_code'] : "") . '">';
-			echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time']; 
+			echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time'];
 			if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
-						echo '<br>' . distance($tripStopTime['stop_lat'],$tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
-					}
-                                        echo '</p>';
-                                        echo bracketsMeanNewLine($tripStopTime['stop_name']);
+				echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+			}
+			echo '</p>';
+			echo bracketsMeanNewLine($tripStopTime['stop_name']);
 			echo '</a></li>';
-                        flush(); @ob_flush();
+			flush();
+			@ob_flush();
 		}
 	}
 	else {
@@ -89,7 +92,6 @@
 	}
 }
 echo '</ul>';
-
 echo '</span>';
 include_footer();
 ?>