--- a/stop.php
+++ b/stop.php
@@ -1,7 +1,5 @@
 <?php
 include ('include/common.inc.php');
-$stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);
-$stopcode = filter_var($_REQUEST['stopcode'], FILTER_SANITIZE_STRING);
 if ($stopid) $stop = getStop($stopid);
 /*if ($stopcode != "" && $stop[5] != $stopcode) {
 	$url = $APIurl . "/json/stopcodesearch?q=" . $stopcode;
@@ -14,6 +12,7 @@
 	// expand out to all platforms
 	
 }*/
+
 $stops = Array();
 $stopPositions = Array();
 $stopNames = Array();
@@ -21,8 +20,7 @@
 $allStopsTrips = Array();
 $fetchedTripSequences = Array();
 $stopLinks = "";
-if (isset($_REQUEST['stopids'])) {
-	$stopids = explode(",", filter_var($_REQUEST['stopids'], FILTER_SANITIZE_STRING));
+if (isset($stopids)) {
 	foreach ($stopids as $sub_stopid) {
 		$stops[] = getStop($sub_stopid);
 	}
@@ -33,11 +31,11 @@
 		//	$stopNames[$key] = $sub_stop[1] . ' Stop #' . ($key + 1);
 		if (strpos($stop["stop_name"], "Station")) {
 			$stopNames[$key] = 'Platform ' . ($key + 1);
-			$stopLinks.= '<a href="stop.php?stopid=' . $sub_stop["stop_id"] . '&stopcode=' . $sub_stop["stop_code"] . '">' . $sub_stop["stop_name"] . '</a> ';
+			$stopLinks.= '<a href="stop.php?stopid=' . $sub_stop["stop_id"] . '&amp;stopcode=' . $sub_stop["stop_code"] . '">' . $sub_stop["stop_name"] . '</a> ';
 		}
 		else {
 			$stopNames[$key] = '#' . ($key + 1);
-			$stopLinks.= '<a href="stop.php?stopid=' . $sub_stop["stop_id"] . '&stopcode=' . $sub_stop["stop_code"] . '">' . $sub_stop["stop_name"] . ' Stop #' . ($key + 1) . '</a> ';
+			$stopLinks.= '<a href="stop.php?stopid=' . $sub_stop["stop_id"] . '&amp;stopcode=' . $sub_stop["stop_code"] . '">' . $sub_stop["stop_name"] . ' Stop #' . ($key + 1) . '</a> ';
 		}
 		$stopPositions[$key] = Array(
 			$sub_stop["stop_lat"],
@@ -63,22 +61,29 @@
 	}
 }
 include_header($stop['stop_name'], "stop");
-timePlaceSettings();
-echo '<div data-role="content" class="ui-content" role="main">        <a name="maincontent" id="maincontent"></a>';
+/*$serviceAlerts = json_decode(getPage(curPageURL() . "/servicealerts_api.php?filter_class=stop&filter_id=".$stopid) , true);
+
+foreach($serviceAlerts['entities'] as $serviceAlert) {
+    echo '<div id="servicewarning">'.$serviceAlert['alert']['description']['translation'].'</div>';
+}*/
+
+echo '<span class="content-secondary">';
 echo $stopLinks;
 if (sizeof($stops) > 0) {
 	trackEvent("View Stops", "View Combined Stops", $stop["stop_name"], $stop["stop_id"]);
-	echo '<p>' . staticmap($stopPositions) . '</p>';
+	echo staticmap($stopPositions);
 }
 else {
 	trackEvent("View Stops", "View Single Stop", $stop["stop_name"], $stop["stop_id"]);
-	echo '<p>' . staticmap(Array(
+	echo staticmap(Array(
 		0 => Array(
 			$stop["stop_lat"],
 			$stop["stop_lon"]
 		)
-	)) . '</p>';
+	)) ;
 }
+timePlaceSettings();
+echo '</span><span class="content-primary">';
 echo '  <ul data-role="listview"  data-inset="true">';
 if (sizeof($allStopsTrips) > 0) {
     sktimesort($allStopsTrips,"arrival_time", true);
@@ -88,12 +93,12 @@
 	$trips = getStopTripsWithTimes($stopid);
 }
 if (sizeof($trips) == 0) {
-	echo "<li> <center>No trips in the near future.</center> </li>";
+	echo "<li style='text-align: center;'>No trips in the near future.</li>";
 }
 else {
 	foreach ($trips as $trip) {
 		echo '<li>';
-		echo '<a href="trip.php?stopid=' . $stopid . '&tripid=' . $trip['trip_id'] . '"><h3>' . $trip['route_short_name'] . " " . $trip['route_long_name'] . "</h3><p>";
+		echo '<a href="trip.php?stopid=' . $stopid . '&amp;tripid=' . $trip['trip_id'] . '"><h3>' . $trip['route_short_name'] . " " . $trip['route_long_name'] . "</h3><p>";
 		$viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
 		if ($viaPoints != "") echo '<br><span class="viaPoints">Via: ' . $viaPoints . '</span>';
 		if (sizeof($tripStopNumbers) > 0) {
@@ -110,7 +115,8 @@
 		@ob_flush();
 	}
 }
-echo '</ul></div>';
+echo '</ul>';
+echo '</span>';
 include_footer();
 ?>