diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc30f9b..2280041 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,8 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
+  pull_request:
 
 permissions:
   contents: read
@@ -11,13 +12,13 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v6
-    - uses: actions/setup-dotnet@v5
-      with:
-        dotnet-version: '10.x'
-        cache: true
-    - run: dotnet publish -r win-x64 -c Release
-    - uses: actions/upload-artifact@v7
-      with:
-        name: blis-ng-exe
-        path: bin/Release/net10.0/win-x64/publish/BLIS-NG.exe
+      - uses: actions/checkout@v6
+      - uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: "10.x"
+          cache: true
+      - run: dotnet publish -r win-x64 -c Release
+      - uses: actions/upload-artifact@v7
+        with:
+          name: blis-ng-exe
+          path: bin/Release/net10.0/win-x64/publish/BLIS-NG.exe
diff --git a/App.axaml b/App.axaml
index 9061240..f4c68b5 100644
--- a/App.axaml
+++ b/App.axaml
@@ -1,10 +1,10 @@
 <Application xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="using:BLIS_NG"
-             RequestedThemeVariant="Light"
-             x:Class="BLIS_NG.App">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:BLIS_NG"
+    RequestedThemeVariant="Light"
+    x:Class="BLIS_NG.App">
 
     <Application.Styles>
-        <FluentTheme/>
+        <FluentTheme />
     </Application.Styles>
 </Application>
diff --git a/BLIS-NG.csproj b/BLIS-NG.csproj
index 8512d04..161ce20 100644
--- a/BLIS-NG.csproj
+++ b/BLIS-NG.csproj
@@ -5,6 +5,8 @@
     <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>BLIS_NG</RootNamespace>
 
+    <CoreCompileDependsOn>PrepareResources;$(CompileDependsOn)</CoreCompileDependsOn>
+
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -27,6 +29,17 @@
     <None Remove=".gitignore" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Update="Lang\Resources.resx">
+      <Generator>MSBuild:Compile</Generator>
+      <PublicClass>true</PublicClass>
+      <StronglyTypedFileName>$(IntermediateOutputPath)\Resources.Designer.cs</StronglyTypedFileName>
+      <StronglyTypedLanguage>CSharp</StronglyTypedLanguage>
+      <StronglyTypedNamespace>BLIS_NG.Lang</StronglyTypedNamespace>
+      <StronglyTypedClassName>Resources</StronglyTypedClassName>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <ItemGroup>
     <!--
       This helps with theme dll-s trimming.
@@ -39,10 +52,6 @@
     <TrimmableAssembly Include="Avalonia.Themes.Default" />
   </ItemGroup>
 
-  <PropertyGroup>
-
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="12.0.0" />
     <PackageReference Include="Avalonia.Desktop" Version="12.0.0" />
@@ -63,21 +72,4 @@
     <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
   </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Lang\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Lang\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-
 </Project>
diff --git a/lang/Resources.resx b/Lang/Resources.resx
similarity index 86%
rename from lang/Resources.resx
rename to Lang/Resources.resx
index ec1368c..cd49a28 100644
--- a/lang/Resources.resx
+++ b/Lang/Resources.resx
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
@@ -54,10 +55,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0,
+      Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0,
+      Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 
   <data name="App_Title" xml:space="preserve">
@@ -66,14 +69,13 @@
   <data name="App_Version_Format" xml:space="preserve">
     <value>BLIS for Windows {0}</value>
   </data>
-  <data name="App_Tagline_Line1" xml:space="preserve">
-    <value>A Joint Initiative of</value>
-  </data>
-  <data name="App_Tagline_Line2" xml:space="preserve">
-    <value>C4G at Georgia Tech, the CDC, and participating countries.</value>
+  <data name="App_Tagline" xml:space="preserve">
+    <value>A Joint Initiative of C4G at Georgia Tech,
+the CDC, and participating countries.</value>
   </data>
   <data name="App_LicenseNotice" xml:space="preserve">
-    <value>C4G BLIS has been licensed under the GNU General Public License version 3. For more information, visit blis.cc.gatech.edu.</value>
+    <value>C4G BLIS has been licensed under the GNU General Public License version 3.
+For more information, visit blis.cc.gatech.edu.</value>
   </data>
   <data name="Button_StartBlis" xml:space="preserve">
     <value>Start BLIS</value>
diff --git a/ViewModels/MainWindowViewModel.cs b/ViewModels/MainWindowViewModel.cs
index ba6c118..a4d21f6 100644
--- a/ViewModels/MainWindowViewModel.cs
+++ b/ViewModels/MainWindowViewModel.cs
@@ -18,9 +18,19 @@ public MainWindowViewModel(IApplicationLifetime? lifetime, ServerControlViewMode
         ApplicationLifetime = lifetime;
         ServerControlViewModel = serverControlViewModel;
 
-        // // Start BLIS on app start
-        // ServerControlViewModel.HandleStartButtonClick();
-        // WindowState = WindowState.Minimized;
+        // BLIS doesn't (yet) run on non-Windows platforms,
+        // so don't attempt to open it in the browser if we're not
+        // on Windows.
+        if (OperatingSystem.IsWindows())
+        {
+            // Start BLIS on app start
+            ServerControlViewModel.HandleStartButtonClick();
+
+            // macOS implementation note: if the application starts minimized,
+            // the launcher window will fail to render properly.
+            // So if this is ever enabled for macOS... don't start minimized.
+            WindowState = WindowState.Minimized;
+        }
     }
 
     public bool Shutdown()
diff --git a/ViewModels/ServerControlViewModel.cs b/ViewModels/ServerControlViewModel.cs
index 0d5d549..28bc916 100644
--- a/ViewModels/ServerControlViewModel.cs
+++ b/ViewModels/ServerControlViewModel.cs
@@ -64,7 +64,8 @@ public void HandleStartButtonClick()
 
     public async void HandleStopButtonClick()
     {
-        if (StopBlisEnabled) {
+        if (StopBlisEnabled)
+        {
             await mainServer.Stop();
         }
     }
@@ -91,7 +92,7 @@ private void HealthcheckAndUpdateStatus(MainServer.ServerStatus serverStatus)
             StartBlisEnabled = true;
             StopBlisEnabled = false;
             ProbablyRunning = true;
-        } 
+        }
         else if (serverStatus.Apache2 == MainServer.State.Stopping || serverStatus.MySql == MainServer.State.Stopping)
         {
             Status = Resources.Status_Stopping;
diff --git a/Views/MainWindow.axaml b/Views/MainWindow.axaml
index 2dac75b..1ef9aaf 100644
--- a/Views/MainWindow.axaml
+++ b/Views/MainWindow.axaml
@@ -1,34 +1,36 @@
 <Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="using:BLIS_NG.ViewModels"
-        xmlns:lang="using:BLIS_NG.Lang"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="640" d:DesignHeight="360"
-        x:CompileBindings="True"
-		x:DataType="vm:MainWindowViewModel"
-        x:Class="BLIS_NG.Views.MainWindow"
-        Title="{Binding WindowTitle}"
-        WindowState="{Binding WindowState}"
-        Padding="10"
-        Height="360"
-        Width="640"
-        CanResize="False">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:BLIS_NG.ViewModels"
+    xmlns:lang="using:BLIS_NG.Lang"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d" d:DesignWidth="640" d:DesignHeight="360"
+    x:CompileBindings="True"
+    x:DataType="vm:MainWindowViewModel"
+    x:Class="BLIS_NG.Views.MainWindow"
+    Title="{Binding WindowTitle}"
+    WindowState="{Binding WindowState}"
+    Padding="10"
+    Height="360"
+    Width="640"
+    CanResize="False">
 
-	<!--We are using Compiled bindings. This is not mandatory but makes life easier. Read more about it here:-->
-	<!-- https://docs.avaloniaui.net/docs/basics/data/data-binding/compiled-bindings -->
+    <!--We
+    are using Compiled bindings. This is not mandatory but makes life easier. Read more about it
+    here:-->
+    <!-- https://docs.avaloniaui.net/docs/basics/data/data-binding/compiled-bindings -->
 
-	<Design.DataContext>
-        <vm:MainWindowViewModel/>
+    <Design.DataContext>
+        <vm:MainWindowViewModel />
     </Design.DataContext>
 
-	<Grid 
-        DataContext="{Binding ServerControlViewModel}" 
+    <Grid
+        DataContext="{Binding ServerControlViewModel}"
         ColumnDefinitions="*,*,*,*,*"
-        RowDefinitions="*,*,*,*,*"
+        RowDefinitions="*,*,*,Auto,*"
     >
-		<TextBlock 
-            TextAlignment="Left" 
+        <TextBlock
+            TextAlignment="Left"
             FontWeight="Normal"
             FontSize="36"
             VerticalAlignment="Center"
@@ -39,9 +41,9 @@
             <Run Text="{x:Static lang:Resources.App_Title}" />
         </TextBlock>
 
-        <TextBlock 
-            TextAlignment="Left" 
-            FontSize="18" 
+        <TextBlock
+            TextAlignment="Left"
+            FontSize="18"
             Text="{Binding AppVersion}"
             VerticalAlignment="Top"
             Grid.Row="1"
@@ -58,9 +60,7 @@
             Grid.Column="0"
             Grid.ColumnSpan="5"
         >
-            <Run Text="{x:Static lang:Resources.App_Tagline_Line1}" />
-            <LineBreak/>
-            <Run Text="{x:Static lang:Resources.App_Tagline_Line2}" />
+            <Run Text="{x:Static lang:Resources.App_Tagline}" />
         </TextBlock>
 
         <TextBlock
@@ -83,14 +83,14 @@
         >
             <TextBlock Width="240" VerticalAlignment="Center" Text="{Binding Status}"></TextBlock>
             <Button Width="160"
-            Command="{Binding StartServerCommand}"
-            IsEnabled="{Binding StartBlisEnabled}"
-            Content="{x:Static lang:Resources.Button_StartBlis}" />
+                Command="{Binding StartServerCommand}"
+                IsEnabled="{Binding StartBlisEnabled}"
+                Content="{x:Static lang:Resources.Button_StartBlis}" />
 
             <Button Width="160"
-            Command="{Binding StopServerCommand}"
-            IsEnabled="{Binding StopBlisEnabled}"
-            Content="{x:Static lang:Resources.Button_StopBlis}" />
+                Command="{Binding StopServerCommand}"
+                IsEnabled="{Binding StopBlisEnabled}"
+                Content="{x:Static lang:Resources.Button_StopBlis}" />
 
         </StackPanel>
     </Grid>
diff --git a/lang/resources.cs b/lang/resources.cs
deleted file mode 100644
index 9320a3e..0000000
--- a/lang/resources.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Globalization;
-using System.Reflection;
-using System.Resources;
-
-namespace BLIS_NG.Lang;
-
-public static class Resources
-{
-    private static readonly ResourceManager ResourceManager = new(
-        "BLIS_NG.Lang.Resources",
-        Assembly.GetExecutingAssembly());
-
-    public static CultureInfo? Culture { get; set; }
-
-    private static string Get(string key, string fallback) =>
-        ResourceManager.GetString(key, Culture) ?? fallback;
-
-    public static string App_Title => Get(nameof(App_Title), "Basic Lab Information System (BLIS)");
-    public static string App_Version_Format => Get(nameof(App_Version_Format), "BLIS for Windows {0}");
-    public static string App_Tagline_Line1 => Get(nameof(App_Tagline_Line1), "A Joint Initiative of");
-    public static string App_Tagline_Line2 => Get(nameof(App_Tagline_Line2), "C4G at Georgia Tech, the CDC, and participating countries.");
-    public static string App_LicenseNotice => Get(nameof(App_LicenseNotice), "C4G BLIS has been licensed under the GNU General Public License version 3. For more information, visit blis.cc.gatech.edu.");
-    public static string Button_StartBlis => Get(nameof(Button_StartBlis), "Start BLIS");
-    public static string Button_StopBlis => Get(nameof(Button_StopBlis), "Stop BLIS");
-    public static string Status_Healthy => Get(nameof(Status_Healthy), "Status: Healthy");
-    public static string Status_Starting => Get(nameof(Status_Starting), "Status: Starting");
-    public static string Status_ApacheHealthcheckFailed => Get(nameof(Status_ApacheHealthcheckFailed), "Status: Apache2 health check failed.");
-    public static string Status_Stopping => Get(nameof(Status_Stopping), "Status: Stopping");
-    public static string Status_Stopped => Get(nameof(Status_Stopped), "Status: Stopped");
-}