diff --git a/.air.toml b/.air.toml
new file mode 100644
index 0000000..1af2d00
--- /dev/null
+++ b/.air.toml
@@ -0,0 +1,52 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+  args_bin = []
+  bin = "./tmp/main"
+  cmd = "go build -o ./tmp/main ./cmd/main.go"
+  delay = 1000
+  exclude_dir = ["assets", "tmp", "vendor", "testdata", "static"]
+  exclude_file = []
+  exclude_regex = ["_test.go"]
+  exclude_unchanged = false
+  follow_symlink = false
+  full_bin = ""
+  include_dir = []
+  include_ext = ["go", "tpl", "tmpl", "html"]
+  include_file = []
+  kill_delay = "0s"
+  log = "build-errors.log"
+  poll = false
+  poll_interval = 0
+  post_cmd = []
+  pre_cmd = []
+  rerun = false
+  rerun_delay = 500
+  send_interrupt = false
+  stop_on_error = false
+
+[color]
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  main_only = false
+  silent = false
+  time = false
+
+[misc]
+  clean_on_exit = false
+
+[proxy]
+  app_port = 0
+  enabled = false
+  proxy_port = 0
+
+[screen]
+  clear_on_rebuild = false
+  keep_scroll = true
diff --git a/.gitignore b/.gitignore
index e8fb14f..b8da24a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gtfs/
 /gtfs.zip
 /pretend-feed.bin
+/tmp/
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..bbe9527
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,3 @@
+- mobile
+- advanced filtering
+- show stops for trip
\ No newline at end of file
diff --git a/cmd/main.go b/cmd/main.go
index 5a932fb..3a4f2ce 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -257,5 +257,8 @@ func main() {
 
 	fmt.Printf("Started on port %s\n", port)
 
-	http.ListenAndServe(":"+port, nil)
+	err = http.ListenAndServe(":"+port, nil)
+	if err != nil {
+		log.Fatal(err)
+	}
 }
diff --git a/static/index.html b/static/index.html
index bb214ea..7eba1f8 100644
--- a/static/index.html
+++ b/static/index.html
@@ -11,10 +11,15 @@
       crossorigin=""
     />
 
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">
+
     <style>
       html,
       body {
         margin: 0;
+        font-family: "Open Sans", sans-serif;
       }
 
       #sidebar {
@@ -27,8 +32,6 @@
         border-radius: 999px;
         width: 20px;
         height: 20px;
-        margin-left: -10px;
-        margin-top: -10px;
         padding: 8px;
         fill: white;
         /* box-shadow: 0px 0px 10px black; */
@@ -37,6 +40,11 @@
         background-color: var(--color);
       }
 
+      .vehicle:not(.vehicle-centered) {
+        margin-left: -10px;
+        margin-top: -10px;
+      }
+
       .vehicle-plain {
         /* bus */
         background-color: white;
@@ -46,10 +54,16 @@
       .vehicle-small {
         width: 15px;
         height: 15px;
+      }
+      .vehicle-small:not(.vehicle-centered) {
         margin-left: -7px;
         margin-top: -7px;
       }
 
+      .vehicle-rainbow {
+        background-image: linear-gradient(to bottom right, #2eb566 33%, #004a97 33%, #004a97 66%, #be2036 66%);
+      }
+
       #banner {
         grid-column: span 2;
         background-color: #ef4444;
@@ -63,10 +77,24 @@
       #banner.hidden {
         display: none;
       }
-      
+
       #map, #sidebar {
         grid-row: 2 / 3;
       }
+
+      #sidebar label {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        margin-bottom: 4px;
+      }
+
+      .station {
+        background-color: var(--color);
+        width: 10px;
+        height: 10px;
+        border-radius: 999px;
+      }
     </style>
   </head>
 
@@ -93,6 +121,9 @@
 
         <div>
           <label for="bus">
+            <div class="vehicle vehicle-plain vehicle-centered" style="--color: #2eb566;">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M192 64C139 64 96 107 96 160L96 448C96 477.8 116.4 502.9 144 510L144 544C144 561.7 158.3 576 176 576L192 576C209.7 576 224 561.7 224 544L224 512L416 512L416 544C416 561.7 430.3 576 448 576L464 576C481.7 576 496 561.7 496 544L496 510C523.6 502.9 544 477.8 544 448L544 160C544 107 501 64 448 64L192 64zM160 240C160 222.3 174.3 208 192 208L296 208L296 320L192 320C174.3 320 160 305.7 160 288L160 240zM344 320L344 208L448 208C465.7 208 480 222.3 480 240L480 288C480 305.7 465.7 320 448 320L344 320zM192 384C209.7 384 224 398.3 224 416C224 433.7 209.7 448 192 448C174.3 448 160 433.7 160 416C160 398.3 174.3 384 192 384zM448 384C465.7 384 480 398.3 480 416C480 433.7 465.7 448 448 448C430.3 448 416 433.7 416 416C416 398.3 430.3 384 448 384zM248 136C248 122.7 258.7 112 272 112L368 112C381.3 112 392 122.7 392 136C392 149.3 381.3 160 368 160L272 160C258.7 160 248 149.3 248 136z"/></svg>
+            </div>
             Regular Bus
             <input
               type="checkbox"
@@ -105,6 +136,9 @@
         </div>
         <div>
           <label for="brt">
+            <div class="vehicle vehicle-centered" style="--color: #1191d0;">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M192 64C139 64 96 107 96 160L96 448C96 477.8 116.4 502.9 144 510L144 544C144 561.7 158.3 576 176 576L192 576C209.7 576 224 561.7 224 544L224 512L416 512L416 544C416 561.7 430.3 576 448 576L464 576C481.7 576 496 561.7 496 544L496 510C523.6 502.9 544 477.8 544 448L544 160C544 107 501 64 448 64L192 64zM160 240C160 222.3 174.3 208 192 208L296 208L296 320L192 320C174.3 320 160 305.7 160 288L160 240zM344 320L344 208L448 208C465.7 208 480 222.3 480 240L480 288C480 305.7 465.7 320 448 320L344 320zM192 384C209.7 384 224 398.3 224 416C224 433.7 209.7 448 192 448C174.3 448 160 433.7 160 416C160 398.3 174.3 384 192 384zM448 384C465.7 384 480 398.3 480 416C480 433.7 465.7 448 448 448C430.3 448 416 433.7 416 416C416 398.3 430.3 384 448 384zM248 136C248 122.7 258.7 112 272 112L368 112C381.3 112 392 122.7 392 136C392 149.3 381.3 160 368 160L272 160C258.7 160 248 149.3 248 136z"/></svg>
+            </div>
             BRT
             <input
               type="checkbox"
@@ -117,6 +151,9 @@
         </div>
         <div>
           <label for="trax">
+            <div class="vehicle vehicle-centered vehicle-rainbow">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M128 72C128 58.7 138.7 48 152 48L488 48C501.3 48 512 58.7 512 72L512 104C512 117.3 501.3 128 488 128C474.7 128 464 117.3 464 104L464 96L344 96L344 160L384 160C437 160 480 203 480 256L480 416C480 447.2 465.1 475 442 492.5L506.3 568.5C514.9 578.6 513.6 593.8 503.5 602.3C493.4 610.8 478.2 609.6 469.7 599.5L395.1 511.4C391.5 511.8 387.8 512 384 512L256 512C252.2 512 248.5 511.8 244.9 511.4L170.3 599.5C161.7 609.6 146.6 610.9 136.5 602.3C126.4 593.7 125.1 578.6 133.7 568.5L198 492.5C174.9 475 160 447.2 160 416L160 256C160 203 203 160 256 160L296 160L296 96L176 96L176 104C176 117.3 165.3 128 152 128C138.7 128 128 117.3 128 104L128 72zM256 224C238.3 224 224 238.3 224 256L224 288C224 305.7 238.3 320 256 320L384 320C401.7 320 416 305.7 416 288L416 256C416 238.3 401.7 224 384 224L256 224zM288 416C288 398.3 273.7 384 256 384C238.3 384 224 398.3 224 416C224 433.7 238.3 448 256 448C273.7 448 288 433.7 288 416zM384 448C401.7 448 416 433.7 416 416C416 398.3 401.7 384 384 384C366.3 384 352 398.3 352 416C352 433.7 366.3 448 384 448z"/></svg>
+            </div>
             TRAX + S-Line (light rail)
             <input
               type="checkbox"
@@ -129,6 +166,9 @@
         </div>
         <div>
           <label for="frontrunner">
+            <div class="vehicle vehicle-centered" style="--color: #c227b9;">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M128 160C128 107 171 64 224 64L416 64C469 64 512 107 512 160L512 416C512 456.1 487.4 490.5 452.5 504.8L506.4 568.5C515 578.6 513.7 593.8 503.6 602.3C493.5 610.8 478.3 609.6 469.8 599.5L395.8 512L244.5 512L170.5 599.5C161.9 609.6 146.8 610.9 136.7 602.3C126.6 593.7 125.3 578.6 133.9 568.5L187.8 504.8C152.6 490.5 128 456.1 128 416L128 160zM192 192L192 288C192 305.7 206.3 320 224 320L416 320C433.7 320 448 305.7 448 288L448 192C448 174.3 433.7 160 416 160L224 160C206.3 160 192 174.3 192 192zM320 448C337.7 448 352 433.7 352 416C352 398.3 337.7 384 320 384C302.3 384 288 398.3 288 416C288 433.7 302.3 448 320 448z"/></svg>
+            </div>
             FrontRunner (commuter rail)
             <input
               type="checkbox"
@@ -145,7 +185,9 @@
         <div>
           <p>There are...</p>
           <ul>
-            <li><strong id="count-bus">-</strong> bus(es)</li>
+            <li>
+              <strong id="count-bus">-</strong> bus(es)
+            </li>
             <li><strong id="count-trax">-</strong> TRAX train(s)</li>
             <li>
               <strong id="count-frontrunner">-</strong> FrontRunner train(s)
diff --git a/static/js/main.js b/static/js/main.js
index 42e38a4..dbe9ac5 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -1,6 +1,7 @@
 import * as shapes from "./shapes.js";
 import protobuf from "https://cdn.jsdelivr.net/npm/protobufjs@8.0.0/dist/protobuf.js/+esm";
 import * as L from "https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet-src.esm.js";
+import stations from "./stations.js"
 
 let lastUpdated;
 
@@ -31,11 +32,38 @@ const brtLayer = L.layerGroup().addTo(map);
 const traxLayer = L.layerGroup().addTo(map);
 const frontRunnerLayer = L.layerGroup().addTo(map);
 
-L.polyline(shapes.blueLine, { color: "#004a97" }).addTo(map);
-L.polyline(shapes.redLine, { color: "#be2036" }).addTo(map);
-L.polyline(shapes.greenLine, { color: "#2eb566" }).addTo(map);
-L.polyline(shapes.sLine, { color: "#77777a" }).addTo(map);
-L.polyline(shapes.frontRunner, { color: "#c227b9" }).addTo(map);
+L.polyline(shapes.blueLine, { color: "#004a97", zIndexOffset: 10 }).addTo(map);
+L.polyline(shapes.redLine, { color: "#be2036", zIndexOffset: 10 }).addTo(map);
+L.polyline(shapes.greenLine, { color: "#2eb566", zIndexOffset: 10 }).addTo(map);
+L.polyline(shapes.sLine, { color: "#77777a", zIndexOffset: 10 }).addTo(map);
+L.polyline(shapes.frontRunner, { color: "#c227b9", zIndexOffset: 10 }).addTo(map);
+
+// render stations
+for (const station of stations) {
+    let color = "";
+    switch (station.lines[0]) {
+        case "red":
+            color = "#be2036"
+            break
+        case "blue":
+            color = "#004a97"
+            break
+        case "green":
+            color = "#2eb566"
+            break
+        case "s-line":
+            color = "#77777a"
+            break
+    }
+
+    L.marker([station.lat, station.lon], {
+        zIndexOffset: 2000,
+        icon: L.divIcon({
+            className: "",
+            html: `<div class="station" style="--color: ${color};"></div>`
+        })
+    }).addTo(map)
+}
 
 function clearMap() {
   busLayer.clearLayers();
@@ -121,8 +149,8 @@ protobuf.load("/schema.proto").then((root) => {
         zIndexOffset:
           vehicle.route.type == RouteType.TRAM ||
           vehicle.route.type == RouteType.RAIL
-            ? 1000
-            : 1,
+            ? 4000
+            : 3000,
         icon: L.divIcon({
           className: "",
           html: `<div class="vehicle ${
diff --git a/static/js/stations.js b/static/js/stations.js
new file mode 100644
index 0000000..6eab5fe
--- /dev/null
+++ b/static/js/stations.js
@@ -0,0 +1,351 @@
+export default [
+    // TRAX
+    {
+        name: "Gallivan Plaza Station",
+        lat: 40.763087,
+        lon: -111.891102,
+        lines: ["green", "blue"],
+    },
+    {
+        name: "Library Station",
+        lat: 40.760643,
+        lon: -111.884956,
+        lines: ["red"],
+    },
+    {
+        name: "Trolley Station",
+        lat: 40.760672,
+        lon: -111.873552,
+        lines: ["red"],
+    },
+    {
+        name: "900 East Station",
+        lat: 40.760671,
+        lon: -111.866732,
+        lines: ["red"],
+    },
+    {
+        name: "Stadium Station",
+        lat: 40.760126,
+        lon: -111.852171,
+        lines: ["red"],
+    },
+    {
+        name: "City Center Station",
+        lat: 40.768217,
+        lon: -111.891081,
+        lines: ["green", "blue"],
+    },
+    {
+        name: "Millcreek Station",
+        lat: 40.701067,
+        lon: -111.896939,
+        lines: ["red", "blue"],
+    },
+    {
+        name: "Meadowbrook Station",
+        lat: 40.688026,
+        lon: -111.896725,
+        lines: ["red", "blue"],
+    },
+    {
+        name: "Murray North Station",
+        lat: 40.677155,
+        lon: -111.894053,
+        lines: ["red", "blue"],
+    },
+    {
+        name: "Murray Central Station",
+        lat: 40.660269,
+        lon: -111.895282,
+        lines: ["red", "blue"],
+    },
+    {
+        name: "Fashion Place West Station",
+        lat: 40.633823,
+        lon: -111.898319,
+        lines: ["red", "blue"],
+    },
+    {
+        name: "Midvale Fort Union Station",
+        lat: 40.619458,
+        lon: -111.898381,
+        lines: ["blue"],
+    },
+    {
+        name: "Midvale Center Station",
+        lat: 40.610541,
+        lon: -111.893216,
+        lines: ["blue"],
+    },
+    {
+        name: "Historic Sandy Station",
+        lat: 40.589811,
+        lon: -111.885661,
+        lines: ["blue"],
+    },
+    {
+        name: "Sandy Civic Center Station",
+        lat: 40.571127,
+        lon: -111.884681,
+        lines: ["blue"],
+    },
+    {
+        name: "Arena Station",
+        lat: 40.769344,
+        lon: -111.901146,
+        lines: ["green", "blue"],
+    },
+    {
+        name: "Temple Square Station",
+        lat: 40.769353,
+        lon: -111.895321,
+        lines: ["green", "blue"],
+    },
+    {
+        name: "Courthouse Station",
+        lat: 40.759536,
+        lon: -111.891071,
+        lines: ["green", "blue", "red"],
+    },
+    {
+        name: "Ballpark Station",
+        lat: 40.742583,
+        lon: -111.896781,
+        lines: ["green", "blue", "red"],
+    },
+    {
+        name: "Central Pointe Station",
+        lat: 40.724801,
+        lon: -111.896861,
+        lines: ["green", "blue", "red"],
+    },
+    {
+        name: "University South Campus Station",
+        lat: 40.760509,
+        lon: -111.839146,
+        lines: ["red"],
+    },
+    {
+        name: "Fort Douglas Station",
+        lat: 40.764766,
+        lon: -111.836793,
+        lines: ["red"],
+    },
+    {
+        name: "University Medical Center",
+        lat: 40.769871,
+        lon: -111.839201,
+        lines: ["red"],
+    },
+    {
+        name: "900 South Station",
+        lat: 40.750058,
+        lon: -111.896818,
+        lines: ["green", "blue", "red"],
+    },
+    {
+        name: "Sandy Expo Station",
+        lat: 40.581703,
+        lon: -111.886234,
+        lines: ["blue"],
+    },
+    {
+        name: "Salt Lake Central Station",
+        lat: 40.762533,
+        lon: -111.90829600000001,
+        lines: ["blue"],
+    },
+    {
+        name: "Planetarium Station",
+        lat: 40.766858,
+        lon: -111.902524,
+        lines: ["blue"],
+    },
+    {
+        name: "Old Greektown Station",
+        lat: 40.765022,
+        lon: -111.905788,
+        lines: ["blue"],
+    },
+    {
+        name: "Daybreak Parkway Station",
+        lat: 40.544377,
+        lon: -112.014304,
+        lines: ["red"],
+    },
+    {
+        name: "South Jordan Parkway Station",
+        lat: 40.559038,
+        lon: -112.024643,
+        lines: ["red"],
+    },
+    {
+        name: "5600 W. Old Bingham Hwy Station",
+        lat: 40.569441,
+        lon: -112.024871,
+        lines: ["red"],
+    },
+    {
+        name: "4800 W. Old Bingham Hwy Station",
+        lat: 40.581652,
+        lon: -112.003837,
+        lines: ["red"],
+    },
+    {
+        name: "Jordan Valley Station",
+        lat: 40.594939,
+        lon: -111.971375,
+        lines: ["red"],
+    },
+    {
+        name: "2700 W. Sugar Factory Rd Station",
+        lat: 40.599207,
+        lon: -111.956458,
+        lines: ["red"],
+    },
+    {
+        name: "West Jordan City Center Station",
+        lat: 40.605024,
+        lon: -111.936071,
+        lines: ["red"],
+    },
+    {
+        name: "Historic Gardner Station",
+        lat: 40.608219,
+        lon: -111.924005,
+        lines: ["red"],
+    },
+    {
+        name: "Bingham Junction Station",
+        lat: 40.617138,
+        lon: -111.914906,
+        lines: ["red"],
+    },
+    {
+        name: "River Trail Station",
+        lat: 40.720605,
+        lon: -111.923811,
+        lines: ["green"],
+    },
+    {
+        name: "Redwood Junction Station",
+        lat: 40.711149,
+        lon: -111.939324,
+        lines: ["green"],
+    },
+    {
+        name: "Decker Lake Station",
+        lat: 40.705035,
+        lon: -111.948675,
+        lines: ["green"],
+    },
+    {
+        name: "West Valley Central Station",
+        lat: 40.694366,
+        lon: -111.958917,
+        lines: ["green"],
+    },
+    {
+        name: "North Temple Bridge/Guadalupe",
+        lat: 40.771587,
+        lon: -111.905195,
+        lines: ["green"],
+    },
+    {
+        name: "Jackson/Euclid Station",
+        lat: 40.771502,
+        lon: -111.914486,
+        lines: ["green"],
+    },
+    {
+        name: "Fairpark Station",
+        lat: 40.771468,
+        lon: -111.923759,
+        lines: ["green"],
+    },
+    {
+        name: "Power Station",
+        lat: 40.771499,
+        lon: -111.933502,
+        lines: ["green"],
+    },
+    {
+        name: "1940 W. North Temple Station",
+        lat: 40.771536,
+        lon: -111.945736,
+        lines: ["green"],
+    },
+    {
+        name: "Airport Station",
+        lat: 40.784356,
+        lon: -111.982117,
+        lines: ["green"],
+    },
+    {
+        name: "Crescent View Station",
+        lat: 40.545343,
+        lon: -111.878751,
+        lines: ["blue"],
+    },
+    {
+        name: "Kimballs Lane Station",
+        lat: 40.536528,
+        lon: -111.872436,
+        lines: ["blue"],
+    },
+    {
+        name: "Draper Town Center Station",
+        lat: 40.525675,
+        lon: -111.859915,
+        lines: ["blue"],
+    },
+    {
+        name: "South Salt Lake City Station",
+        lat: 40.722263,
+        lon: -111.890174,
+        lines: ["s-line"],
+    },
+    {
+        name: "300 East Station",
+        lat: 40.722324,
+        lon: -111.882335,
+        lines: ["s-line"],
+    },
+    {
+        name: "500 East Station",
+        lat: 40.722306,
+        lon: -111.877085,
+        lines: ["s-line"],
+    },
+    {
+        name: "700 East Station",
+        lat: 40.722798,
+        lon: -111.871612,
+        lines: ["s-line"],
+    },
+    {
+        name: "Sugarmont Station",
+        lat: 40.722818,
+        lon: -111.865092,
+        lines: ["s-line"],
+    },
+    {
+        name: "Fairmont Station",
+        lat: 40.722757,
+        lon: -111.861675,
+        lines: ["s-line"],
+    },
+    {
+        name: "600 South Station",
+        lat: 40.756057,
+        lon: -111.891096,
+        lines: ["green", "red", "blue"],
+    },
+    {
+        name: "South Jordan Downtown Station",
+        lat: 40.549573,
+        lon: -112.019345,
+        lines: ["red"],
+    },
+];