diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 71e3512..b9917cd 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "AMTK Status",
-    "version": "0.1.104"
+    "version": "0.1.105"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/Gitinfo.txt b/src/Gitinfo.txt
index 7df7e91..ee66a6c 100644
--- a/src/Gitinfo.txt
+++ b/src/Gitinfo.txt
@@ -1 +1 @@
-0.1.104
\ No newline at end of file
+0.1.105
\ No newline at end of file
diff --git a/src/Pages/Home.razor b/src/Pages/Home.razor
index ebb25c4..6a22071 100644
--- a/src/Pages/Home.razor
+++ b/src/Pages/Home.razor
@@ -10,25 +10,25 @@
     </form>
     <div class="row">
         <div class="container">
-            <button @onclick="PennStation">NY Penn Station</button>
+            <StationBtn Code="NYP" Station="NY Penn Station" />
         </div>
         <div class="container">
-            <button @onclick="UnionStation">DC Union Station</button>
+            <StationBtn Code="WAS" Station="DC Union Station" />
         </div>
         <div class="container">
-            <button @onclick="BostonSouth">Boston South Station</button>
+            <StationBtn Code="BOS" Station="Boston South Station" />
         </div>
     </div>
     <div class="row">
         <div class="container">
-            <button @onclick="AshlandVA">Ashland, VA</button>
-            <button @onclick="SanJuanCA">San Juan Capistrano, CA</button>
-            <button @onclick="FortMadisonIA">Fort Madison, IA</button>
+            <StationBtn Code="ASD" Station="Ashland, VA" />
+            <StationBtn Code="SNC" Station="San Juan Capistrano, CA" />
+            <StationBtn Code="FMD" Station="Fort Madison, IA" />
         </div>
         <div class="container">
-            <button @onclick="LaPltaMO">La Plata, MO</button>
-            <button @onclick="QuincyIL">Quincy, IL</button>
-            <button @onclick="SpartanburgSC">Spartanburg, SC</button>
+            <StationBtn Code="LAP" Station="La Plata, MO" />
+            <StationBtn Code="QCY" Station="Quincy, IL" />
+            <StationBtn Code="SPB" Station="Spartanburg, SC" />
         </div>
     </div>
 </div>
@@ -68,57 +68,6 @@
 
         NavigationManager.NavigateTo(StationCode);
     }
-
-    private async Task SanJuanCA()
-    {
-        await RedirectToStat("SNC");
-    }
-
-    private async Task AshlandVA()
-    {
-        await RedirectToStat("ASD");
-    }
-
-    private async Task LaPltaMO()
-    {
-        await RedirectToStat("LAP");
-    }
-
-    private async Task FortMadisonIA()
-    {
-        await RedirectToStat("FMD");
-    }
-
-    private async Task FlagstaffAZ()
-    {
-        await RedirectToStat("FLG");
-    }
-
-    private async Task QuincyIL()
-    {
-        await RedirectToStat("QCY");
-    }
-
-    private async Task PennStation()
-    {
-        await RedirectToStat("NYP");
-    }
-
-    private async Task UnionStation()
-    {
-        await RedirectToStat("WAS");
-    }
-
-    private async Task BostonSouth()
-    {
-        await RedirectToStat("BOS");
-    }
-
-    private async Task SpartanburgSC()
-    {
-        await RedirectToStat("SPB");
-    }
-
     private async Task StationAsync()
     {
         await RedirectToStat(CodeInput!);
diff --git a/src/Pages/StationBtn.razor b/src/Pages/StationBtn.razor
new file mode 100644
index 0000000..4a38946
--- /dev/null
+++ b/src/Pages/StationBtn.razor
@@ -0,0 +1,18 @@
+@inject IJSRuntime JsRuntime
+@inject NavigationManager NavigationManager
+
+<button @onclick="RedirectToStat">@Station</button>
+
+@code
+{
+    [Parameter] public string? Station { get; set; }
+
+    [Parameter] public string? Code { get; set; }
+
+    private async Task RedirectToStat()
+    {
+        var code = await JsRuntime.InvokeAsync<string>("__TAURI__.tauri.invoke", "station", new { name = Code });
+
+        NavigationManager.NavigateTo(code);
+    }
+}
\ No newline at end of file