--- a/busui/layar_api.php
+++ b/busui/layar_api.php
@@ -4,16 +4,10 @@
 $output['hotspots'] = Array();
 $output['layer'] = "canberrabusstops";
 
+$max_page = 10;
+$max_results = 50;
 $page_start = 0+$_REQUEST['pageKey'];
-$page_end = 10+$_REQUEST['pageKey'];
-$max_results = 50;
-if ($page_end >= $max_results) {
- $output["morePages"] = false;
- $output["nextPageKey"] = null;
-} else {
- $output["morePages"] = true;
- $output["nextPageKey"] = $page_end;    
-}
+$page_end = $max_page+$_REQUEST['pageKey'];
 
 $url = $APIurl."/json/neareststops?lat={$_REQUEST['lat']}&lon={$_REQUEST['lon']}&limit=50";
 $contents = json_decode(getPage($url));
@@ -22,7 +16,7 @@
 foreach ($contents as $row)
 {
     $stopNum++;
-    if ($stopNum > $page_start && $stopNum < $page_end) {
+    if ($stopNum > $page_start && $stopNum <= $page_end) {
         $hotspot = Array();
         $hotspot['id'] = $row[0];
         $hotspot['title'] = $row[1];
@@ -31,7 +25,7 @@
         $hotspot['lon'] = floor($row[3]*1000000);
         $hotspot['distance'] = distance($row[2], $row[3], $_REQUEST['lat'], $_REQUEST['lon']);
         if (!isset($_REQUEST['radius']) || $hotspot['distance'] < $_REQUEST['radius']) {
-            $hotspot['actions'] = Array(Array("label" => 'Visit Webpage', 'uri' => 'http://bus.lambdacomplex.org/'.'stop.php?stopid='.$row[0]));
+            $hotspot['actions'] = Array(Array("label" => 'View more trips/information', 'uri' => 'http://bus.lambdacomplex.org/'.'stop.php?stopid='.$row[0]));
             $url = $APIurl."/json/stoptrips?stop=".$row[0]."&time=".midnight_seconds()."&service_period=".service_period();
             $trips = json_decode(getPage($url));
             debug(print_r($trips,true));
@@ -53,5 +47,12 @@
     $output['errorString'] = 'no results, try increasing range';
     $output['errorCode'] = 21;
 }
+if ($page_end >= $max_results || sizeof($hotspot) < $max_page) {
+ $output["morePages"] = false;
+ $output["nextPageKey"] = null;
+} else {
+ $output["morePages"] = true;
+ $output["nextPageKey"] = $page_end;    
+}
 echo json_encode($output);
 ?>