--- a/stop.php
+++ b/stop.php
@@ -1,5 +1,5 @@
 <?php
-include ('common.inc.php');
+include ('include/common.inc.php');
 $stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);
 $stopcode = filter_var($_REQUEST['stopcode'], FILTER_SANITIZE_STRING);
 $url = $APIurl . "/json/stop?stop_id=" . $stopid;
@@ -48,12 +48,15 @@
 }
 include_header($stop[1], "stop");
 timePlaceSettings();
-echo '<div data-role="content" class="ui-content" role="main">';
+echo '<div data-role="content" class="ui-content" role="main">        <a name="maincontent" id="maincontent"></a>';
 echo $stopLinks;
 if (sizeof($stops) > 0) {
+    trackEvent("View Stops","View Combined Stops", $stop[1], $stop[0]);
+
 	echo '<p>' . staticmap($stopPositions) . '</p>';
 }
 else {
+        trackEvent("View Stops","View Single Stop", $stop[1], $stop[0]);
 	echo '<p>' . staticmap(Array(
 		0 => Array(
 			$stop[2],
@@ -72,10 +75,8 @@
 foreach ($trips as $row) {
 	echo '<li>';
 	echo '<h3><a href="trip.php?stopid=' . $stopid . '&tripid=' . $row[1][0] . '">' . $row[1][1];
-	if (isFastDevice()) {
-		$viaPoints = viaPointNames($row[1][0], $stopid);
-		if ($viaPoints != "") echo '<br><small>Via: ' . $viaPoints . '</small>';
-	}
+        $viaPoints = viaPointNames($row[1][0], $stopid);
+        if ($viaPoints != "") echo '<div class="viaPoints">Via: ' . $viaPoints . '</div>';
 	if (sizeof($tripStopNumbers) > 0) {
             echo '<br><small>Boarding At: ';
             foreach ($tripStopNumbers[$row[1][0]] as $key) {