From 3eb298719e2282edff3a76c8c3ef4920e768a3ae Mon Sep 17 00:00:00 2001
From: Highbyte <highbyte@outlook.com>
Date: Mon, 6 Jul 2026 17:43:32 +0200
Subject: [PATCH 1/4] Improve Avalonia About dialog. Remove "General info" tab
 in center/bottom (all that info moved to About dialog).

---
 .../ViewModels/AboutViewModel.cs              | 41 +++++++-
 .../Views/AboutUserControl.axaml              | 96 +++++++++++++++++--
 .../Views/AboutUserControl.axaml.cs           | 10 +-
 .../Views/MainView.axaml                      | 84 ----------------
 .../Views/MainView.axaml.cs                   |  1 -
 5 files changed, 135 insertions(+), 97 deletions(-)

diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/ViewModels/AboutViewModel.cs b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/ViewModels/AboutViewModel.cs
index dfde1e4bd..5576aa6b3 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/ViewModels/AboutViewModel.cs
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/ViewModels/AboutViewModel.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Reflection;
 using System.Reactive;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Highbyte.DotNet6502.App.Avalonia.Core.Services;
 using ReactiveUI;
@@ -12,6 +14,8 @@ namespace Highbyte.DotNet6502.App.Avalonia.Core.ViewModels;
 /// </summary>
 public class AboutViewModel : ViewModelBase
 {
+    private const string RepositoryUrl = "https://github.com/highbyte/dotnet-6502";
+
     private readonly IAppUpdateService _updateService;
 
     private string _statusText = string.Empty;
@@ -32,13 +36,12 @@ public AboutViewModel(IAppUpdateService updateService)
         _updateService = updateService;
         CurrentVersionDisplay = updateService.CurrentVersionDisplay;
         IsUpdateCheckSupported = updateService.IsSupported;
+        CurrentReleaseNotesUrl = BuildCurrentReleaseNotesUrl(CurrentVersionDisplay);
 
         UpdateNowCommand = ReactiveCommandHelper.CreateSafeCommand(UpdateNowAsync);
         CloseCommand = ReactiveCommandHelper.CreateSafeCommand(() => RequestClose?.Invoke(this, EventArgs.Empty));
 
-        StatusText = IsUpdateCheckSupported
-            ? "Checking for updates…"
-            : "Update checks aren't available for this build.";
+        StatusText = IsUpdateSectionVisible ? "Checking for updates…" : string.Empty;
 
         // Opening the About dialog is an explicit user action, so always run a fresh check (force:true
         // bypasses the daily cadence and the disabled-setting/CI gating). No separate "Check now" needed.
@@ -48,6 +51,14 @@ public AboutViewModel(IAppUpdateService updateService)
 
     public string CurrentVersionDisplay { get; }
     public bool IsUpdateCheckSupported { get; }
+    public bool IsUpdateSectionVisible => IsUpdateCheckSupported;
+    public string? CurrentReleaseNotesUrl { get; }
+    public bool HasCurrentReleaseNotes => !string.IsNullOrEmpty(CurrentReleaseNotesUrl);
+    public string Author => "Highbyte";
+    public string RepoUrl => RepositoryUrl;
+    public string OSVersion => RuntimeInformation.OSDescription;
+    public string DotNetVersion => RuntimeInformation.FrameworkDescription;
+    public string AvaloniaVersion => ReadAvaloniaVersion();
 
     public ReactiveCommand<Unit, Unit> UpdateNowCommand { get; }
     public ReactiveCommand<Unit, Unit> CloseCommand { get; }
@@ -147,7 +158,7 @@ private void ApplyStatus(AppUpdateStatus? status)
     {
         if (status is null)
         {
-            StatusText = "Update checks aren't available for this build.";
+            StatusText = "Update check did not return any result.";
             IsUpdateAvailable = false;
             SuggestedCommand = null;
             ReleaseNotesUrl = null;
@@ -166,4 +177,26 @@ private void ApplyStatus(AppUpdateStatus? status)
         else
             StatusText = $"You're on the latest version ({status.CurrentVersionDisplay}).";
     }
+
+    private static string? BuildCurrentReleaseNotesUrl(string currentVersionDisplay)
+    {
+        if (!currentVersionDisplay.StartsWith("v", StringComparison.Ordinal))
+            return null;
+
+        return $"{RepositoryUrl}/releases/tag/{currentVersionDisplay}";
+    }
+
+    private static string ReadAvaloniaVersion()
+    {
+        try
+        {
+            var asm = typeof(global::Avalonia.Controls.Control).Assembly;
+            var infoAttr = asm.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+            return infoAttr?.InformationalVersion ?? asm.GetName().Version?.ToString() ?? "Unknown";
+        }
+        catch
+        {
+            return "Unknown";
+        }
+    }
 }
diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml
index 7995762f1..95f3c1ff4 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml
@@ -5,10 +5,10 @@
         x:DataType="vm:AboutViewModel"
         AutomationProperties.AutomationId="AboutDialog"
         AutomationProperties.Name="About and updates"
-        Width="480"
+        Width="520"
         MinWidth="360">
 
-    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto" Margin="16">
+    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" Margin="16">
 
         <!-- Title header -->
         <Border Grid.Row="0" CornerRadius="4" Classes="panel-container" Margin="0,0,0,12">
@@ -16,26 +16,108 @@
         </Border>
 
         <!-- Current version -->
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="8" Margin="0,0,0,8">
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="8" Margin="0,0,0,4">
             <TextBlock Text="Version:" VerticalAlignment="Center"/>
             <TextBlock Text="{Binding CurrentVersionDisplay}" Classes="monospace" VerticalAlignment="Center"/>
         </StackPanel>
 
+        <Button Grid.Row="2"
+                Content="Release notes"
+                HorizontalAlignment="Left"
+                Classes="text"
+                IsVisible="{Binding HasCurrentReleaseNotes}"
+                Click="OnCurrentReleaseNotesClick"/>
+
+        <Border Grid.Row="3" Classes="section-container" Margin="0,0,0,12">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" MinWidth="70" MaxWidth="110" />
+                    <ColumnDefinition Width="*" MinWidth="180"/>
+                </Grid.ColumnDefinitions>
+
+                <Border Grid.Row="0" Grid.Column="0" Classes="table-cell">
+                    <TextBlock Text="Version" Classes="small bold" TextWrapping="Wrap" />
+                </Border>
+
+                <Border Grid.Row="0" Grid.Column="1" Classes="table-cell-last-column">
+                    <SelectableTextBlock Text="{Binding CurrentVersionDisplay}" Classes="small" />
+                </Border>
+
+                <Border Grid.Row="1" Grid.Column="0" Classes="table-cell">
+                    <TextBlock Text="By" Classes="small bold" TextWrapping="Wrap" />
+                </Border>
+
+                <Border Grid.Row="1" Grid.Column="1" Classes="table-cell-last-column">
+                    <SelectableTextBlock Text="{Binding Author}" Classes="small" />
+                </Border>
+
+                <Border Grid.Row="2" Grid.Column="0" Classes="table-cell">
+                    <TextBlock Text="Repo" Classes="small bold" TextWrapping="Wrap" />
+                </Border>
+
+                <Border Grid.Row="2" Grid.Column="1" Classes="table-cell-last-column">
+                    <Grid ColumnDefinitions="*,Auto">
+                        <SelectableTextBlock Grid.Column="0" Text="{Binding RepoUrl}" Classes="small" />
+                        <Button Grid.Column="1"
+                                Content="i"
+                                AutomationProperties.AutomationId="AboutRepoLinkButton"
+                                AutomationProperties.Name="Open repository in browser"
+                                Classes="info"
+                                Click="OnRepositoryClick" />
+                    </Grid>
+                </Border>
+
+                <Border Grid.Row="3" Grid.Column="0" Classes="table-cell">
+                    <TextBlock Text="OS" Classes="small bold" TextWrapping="Wrap" />
+                </Border>
+
+                <Border Grid.Row="3" Grid.Column="1" Classes="table-cell-last-column">
+                    <SelectableTextBlock Text="{Binding OSVersion}" Classes="small" />
+                </Border>
+
+                <Border Grid.Row="4" Grid.Column="0" Classes="table-cell">
+                    <TextBlock Text=".NET" Classes="small bold" TextWrapping="Wrap" />
+                </Border>
+
+                <Border Grid.Row="4" Grid.Column="1" Classes="table-cell-last-column">
+                    <SelectableTextBlock Text="{Binding DotNetVersion}" Classes="small" />
+                </Border>
+
+                <Border Grid.Row="5" Grid.Column="0" Classes="table-cell-last-row">
+                    <TextBlock Text="Avalonia" Classes="small bold" TextWrapping="Wrap" />
+                </Border>
+
+                <Border Grid.Row="5" Grid.Column="1" Classes="table-cell-last">
+                    <SelectableTextBlock Text="{Binding AvaloniaVersion}" Classes="small" />
+                </Border>
+            </Grid>
+        </Border>
+
         <!-- Update status line -->
-        <TextBlock Grid.Row="2"
+        <TextBlock Grid.Row="4"
                    Text="{Binding StatusText}"
+                   IsVisible="{Binding IsUpdateSectionVisible}"
                    TextWrapping="Wrap"
                    Margin="0,0,0,8"/>
 
         <!-- Indeterminate progress while checking -->
-        <ProgressBar Grid.Row="3"
+        <ProgressBar Grid.Row="5"
                      IsIndeterminate="True"
                      IsVisible="{Binding IsChecking}"
                      Height="4"
                      Margin="0,0,0,8"/>
 
         <!-- Suggested upgrade command (managed + update available) -->
-        <Grid Grid.Row="4"
+        <Grid Grid.Row="6"
               ColumnDefinitions="*,Auto"
               IsVisible="{Binding HasSuggestedCommand}"
               Margin="0,0,0,12">
@@ -54,7 +136,7 @@
         <!-- Action buttons: secondary "What's new" link on the left; dismiss + the positive primary
              action ("Update now", rightmost, green) on the right. Close stays the Enter-default so an
              accidental Enter can't trigger the quit-and-relaunch update. -->
-        <Grid Grid.Row="5" ColumnDefinitions="*,Auto">
+        <Grid Grid.Row="7" ColumnDefinitions="*,Auto">
             <Button Grid.Column="0"
                     x:Name="ReleaseNotesButton"
                     Content="What's new"
diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml.cs b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml.cs
index 5ddf15b02..977772417 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml.cs
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml.cs
@@ -71,8 +71,16 @@ private void OnCopyCommandClick(object? sender, RoutedEventArgs e)
     }
 
     private void OnReleaseNotesClick(object? sender, RoutedEventArgs e)
+        => LaunchUri((DataContext as AboutViewModel)?.ReleaseNotesUrl);
+
+    private void OnCurrentReleaseNotesClick(object? sender, RoutedEventArgs e)
+        => LaunchUri((DataContext as AboutViewModel)?.CurrentReleaseNotesUrl);
+
+    private void OnRepositoryClick(object? sender, RoutedEventArgs e)
+        => LaunchUri((DataContext as AboutViewModel)?.RepoUrl);
+
+    private void LaunchUri(string? url)
     {
-        var url = (DataContext as AboutViewModel)?.ReleaseNotesUrl;
         if (string.IsNullOrEmpty(url) || !Uri.TryCreate(url, UriKind.Absolute, out var uri))
             return;
         var launcher = TopLevel.GetTopLevel(this)?.Launcher;
diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
index e200c275b..8997645d9 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
@@ -1123,90 +1123,6 @@
                             </Border>
                         </TabItem>
 
-                        <!-- General info -->
-                        <TabItem Name="GeneralInfoTabItem" Header="General info"
-                                 AutomationProperties.AutomationId="GeneralInfoTab"
-                                 AutomationProperties.Name="General info tab">
-                            <ScrollViewer Classes="auto-scroll">
-                                <StackPanel Classes="spacing-tight h-left">
-
-                                    <Border Classes="section-container" Width="500">
-                                        <Grid>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                            </Grid.RowDefinitions>
-
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto" MinWidth="30" MaxWidth="100" />
-                                                <ColumnDefinition Width="*" MinWidth="100"/>
-                                            </Grid.ColumnDefinitions>
-
-                                            <!-- Row 1: Version -->
-                                            <Border Grid.Row="0" Grid.Column="0" Classes="table-cell">
-                                                <TextBlock Text="Version" Classes="small bold" TextWrapping="Wrap" />
-                                            </Border>
-
-                                            <Border Grid.Row="0" Grid.Column="1" Classes="table-cell">
-                                                <SelectableTextBlock Text="{Binding Version}" Classes="small" />
-                                            </Border>
-
-                                            <!-- Row 2: By -->
-                                            <Border Grid.Row="1" Grid.Column="0" Classes="table-cell">
-                                                <TextBlock Text="By" Classes="small bold" TextWrapping="Wrap" />
-                                            </Border>
-
-                                            <Border Grid.Row="1" Grid.Column="1" Classes="table-cell">
-                                                <SelectableTextBlock Text="Highbyte" Classes="small" />
-                                            </Border>
-
-                                            <!-- Row 3: Repo -->
-                                            <Border Grid.Row="2" Grid.Column="0" Classes="table-cell">
-                                                <TextBlock Text="Repo" Classes="small bold" TextWrapping="Wrap" />
-                                            </Border>
-
-                                            <Border Grid.Row="2" Grid.Column="1" Classes="table-cell">
-                                                <SelectableTextBlock Text="https://github.com/highbyte/dotnet-6502" Classes="small" />
-                                            </Border>
-
-                                            <!-- Row: OS version -->
-                                            <Border Grid.Row="3" Grid.Column="0" Classes="table-cell">
-                                                <TextBlock Text="OS" Classes="small bold" TextWrapping="Wrap" />
-                                            </Border>
-
-                                            <Border Grid.Row="3" Grid.Column="1" Classes="table-cell">
-                                                <SelectableTextBlock Text="{Binding OSVersion}" Classes="small" />
-                                            </Border>
-
-                                            <!-- Row: NET runtime version -->
-                                            <Border Grid.Row="4" Grid.Column="0" Classes="table-cell">
-                                                <TextBlock Text=".NET" Classes="small bold" TextWrapping="Wrap" />
-                                            </Border>
-
-                                            <Border Grid.Row="4" Grid.Column="1" Classes="table-cell">
-                                                <SelectableTextBlock Text="{Binding DotNetVersion}" Classes="small" />
-                                            </Border>
-
-                                            <!-- Row: Avalonia version -->
-                                            <Border Grid.Row="5" Grid.Column="0" Classes="table-cell-last-row">
-                                                <TextBlock Text="Avalonia" Classes="small bold" TextWrapping="Wrap" />
-                                            </Border>
-
-                                            <Border Grid.Row="5" Grid.Column="1" Classes="table-cell-last-row">
-                                                <SelectableTextBlock Text="{Binding AvaloniaVersion}" Classes="small" />
-                                            </Border>
-
-                                        </Grid>
-                                    </Border>
-
-                                </StackPanel>
-                            </ScrollViewer>
-                        </TabItem>
-
                     </TabControl>
                 </Border>
             </Grid>
diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml.cs b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml.cs
index 1e3ad3011..c9efa6170 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml.cs
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml.cs
@@ -55,7 +55,6 @@ private static readonly (Key Key, string TabItemName, string Label)[] TabNavigat
         (Key.L, "LogTabItem",              "Log"),
         (Key.S, "ScriptsTabItem",          "Scripts"),
         (Key.D, "DebugAndRemotingTabItem", "Debug & Remoting"),
-        (Key.G, "GeneralInfoTabItem",      "General info"),
     };
 
     // Parameterless constructor - child views created by XAML!

From d1c1b25f78565cc1b00181491346fcad506d7aef Mon Sep 17 00:00:00 2001
From: Highbyte <highbyte@outlook.com>
Date: Mon, 6 Jul 2026 19:37:16 +0200
Subject: [PATCH 2/4] Tweak Avalonia About dialog

---
 .../Styles/ButtonStyles.axaml                 | 11 ++-
 .../Styles/InputStyles.axaml                  |  1 +
 .../ViewModels/AboutViewModel.cs              | 13 ++-
 .../Views/AboutUserControl.axaml              | 87 +++++++++++--------
 .../Views/MainView.axaml                      |  2 +-
 5 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml
index fac0e4b86..177821a6a 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml
@@ -130,12 +130,21 @@
 
     <!-- Text-only button for dialogs -->
     <Style Selector="Button.text">
-        <Setter Property="Padding" Value="8,4"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="0,2,0,0"/>
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="FontWeight" Value="Normal"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Foreground" Value="{DynamicResource AccentBlue}"/>
     </Style>
 
+    <Style Selector="Button.monospace">
+        <Setter Property="FontFamily" Value="{StaticResource MonospaceFontFamily}"/>
+        <Setter Property="FontSize" Value="12"/>
+    </Style>
+
     <Style Selector="Button.text:pointerover">
         <Setter Property="Foreground" Value="{DynamicResource HighlightGold}"/>
     </Style>
diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/InputStyles.axaml b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/InputStyles.axaml
index b7e73bed7..b1dad249c 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/InputStyles.axaml
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/InputStyles.axaml
@@ -11,6 +11,7 @@
         <Setter Property="FontSize" Value="12"/>
         <Setter Property="Padding" Value="8,6"/>
         <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="CornerRadius" Value="2"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Background" Value="{DynamicResource SecondaryBg}"/>
diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/ViewModels/AboutViewModel.cs b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/ViewModels/AboutViewModel.cs
index 5576aa6b3..b1a46e306 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/ViewModels/AboutViewModel.cs
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/ViewModels/AboutViewModel.cs
@@ -65,6 +65,9 @@ public AboutViewModel(IAppUpdateService updateService)
 
     /// <summary>True when a one-click update can be started (managed install with an available update).</summary>
     public bool CanUpdateNow => IsUpdateCheckSupported && _isUpdateAvailable;
+    public bool ShowUpdateAvailableStatus => IsUpdateSectionVisible && _isUpdateAvailable;
+    public bool ShowPlainStatus => IsUpdateSectionVisible && !_isUpdateAvailable;
+    public bool ShowInlineReleaseNotes => ShowUpdateAvailableStatus && HasReleaseNotes;
 
     public string StatusText
     {
@@ -85,13 +88,20 @@ private set
         {
             this.RaiseAndSetIfChanged(ref _isUpdateAvailable, value);
             this.RaisePropertyChanged(nameof(CanUpdateNow));
+            this.RaisePropertyChanged(nameof(ShowUpdateAvailableStatus));
+            this.RaisePropertyChanged(nameof(ShowPlainStatus));
+            this.RaisePropertyChanged(nameof(ShowInlineReleaseNotes));
         }
     }
 
     public string? LatestVersionDisplay
     {
         get => _latestVersionDisplay;
-        private set => this.RaiseAndSetIfChanged(ref _latestVersionDisplay, value);
+        private set
+        {
+            this.RaiseAndSetIfChanged(ref _latestVersionDisplay, value);
+            this.RaisePropertyChanged(nameof(ShowUpdateAvailableStatus));
+        }
     }
 
     /// <summary>The <c>brew</c>/<c>scoop</c> command to run; non-null only when an update is available.</summary>
@@ -114,6 +124,7 @@ private set
         {
             this.RaiseAndSetIfChanged(ref _releaseNotesUrl, value);
             this.RaisePropertyChanged(nameof(HasReleaseNotes));
+            this.RaisePropertyChanged(nameof(ShowInlineReleaseNotes));
         }
     }
 
diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml
index 95f3c1ff4..a6f8806f7 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/AboutUserControl.axaml
@@ -8,7 +8,7 @@
         Width="520"
         MinWidth="360">
 
-    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" Margin="16">
+    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto" Margin="16">
 
         <!-- Title header -->
         <Border Grid.Row="0" CornerRadius="4" Classes="panel-container" Margin="0,0,0,12">
@@ -16,19 +16,20 @@
         </Border>
 
         <!-- Current version -->
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="8" Margin="0,0,0,4">
-            <TextBlock Text="Version:" VerticalAlignment="Center"/>
-            <TextBlock Text="{Binding CurrentVersionDisplay}" Classes="monospace" VerticalAlignment="Center"/>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="8" Margin="0,0,0,12">
+            <TextBlock Text="Current version:" VerticalAlignment="Center"/>
+            <TextBlock Text="{Binding CurrentVersionDisplay}"
+                       Classes="monospace"
+                       VerticalAlignment="Center"
+                       IsVisible="{Binding !HasCurrentReleaseNotes}"/>
+            <Button Content="{Binding CurrentVersionDisplay}"
+                    VerticalAlignment="Center"
+                    Classes="text monospace"
+                    IsVisible="{Binding HasCurrentReleaseNotes}"
+                    Click="OnCurrentReleaseNotesClick"/>
         </StackPanel>
 
-        <Button Grid.Row="2"
-                Content="Release notes"
-                HorizontalAlignment="Left"
-                Classes="text"
-                IsVisible="{Binding HasCurrentReleaseNotes}"
-                Click="OnCurrentReleaseNotesClick"/>
-
-        <Border Grid.Row="3" Classes="section-container" Margin="0,0,0,12">
+        <Border Grid.Row="2" Classes="section-container" Margin="0,0,0,12">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
@@ -36,7 +37,6 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
                 <Grid.ColumnDefinitions>
@@ -45,26 +45,18 @@
                 </Grid.ColumnDefinitions>
 
                 <Border Grid.Row="0" Grid.Column="0" Classes="table-cell">
-                    <TextBlock Text="Version" Classes="small bold" TextWrapping="Wrap" />
-                </Border>
-
-                <Border Grid.Row="0" Grid.Column="1" Classes="table-cell-last-column">
-                    <SelectableTextBlock Text="{Binding CurrentVersionDisplay}" Classes="small" />
-                </Border>
-
-                <Border Grid.Row="1" Grid.Column="0" Classes="table-cell">
                     <TextBlock Text="By" Classes="small bold" TextWrapping="Wrap" />
                 </Border>
 
-                <Border Grid.Row="1" Grid.Column="1" Classes="table-cell-last-column">
+                <Border Grid.Row="0" Grid.Column="1" Classes="table-cell-last-column">
                     <SelectableTextBlock Text="{Binding Author}" Classes="small" />
                 </Border>
 
-                <Border Grid.Row="2" Grid.Column="0" Classes="table-cell">
+                <Border Grid.Row="1" Grid.Column="0" Classes="table-cell">
                     <TextBlock Text="Repo" Classes="small bold" TextWrapping="Wrap" />
                 </Border>
 
-                <Border Grid.Row="2" Grid.Column="1" Classes="table-cell-last-column">
+                <Border Grid.Row="1" Grid.Column="1" Classes="table-cell-last-column">
                     <Grid ColumnDefinitions="*,Auto">
                         <SelectableTextBlock Grid.Column="0" Text="{Binding RepoUrl}" Classes="small" />
                         <Button Grid.Column="1"
@@ -76,48 +68,71 @@
                     </Grid>
                 </Border>
 
-                <Border Grid.Row="3" Grid.Column="0" Classes="table-cell">
+                <Border Grid.Row="2" Grid.Column="0" Classes="table-cell">
                     <TextBlock Text="OS" Classes="small bold" TextWrapping="Wrap" />
                 </Border>
 
-                <Border Grid.Row="3" Grid.Column="1" Classes="table-cell-last-column">
+                <Border Grid.Row="2" Grid.Column="1" Classes="table-cell-last-column">
                     <SelectableTextBlock Text="{Binding OSVersion}" Classes="small" />
                 </Border>
 
-                <Border Grid.Row="4" Grid.Column="0" Classes="table-cell">
+                <Border Grid.Row="3" Grid.Column="0" Classes="table-cell">
                     <TextBlock Text=".NET" Classes="small bold" TextWrapping="Wrap" />
                 </Border>
 
-                <Border Grid.Row="4" Grid.Column="1" Classes="table-cell-last-column">
+                <Border Grid.Row="3" Grid.Column="1" Classes="table-cell-last-column">
                     <SelectableTextBlock Text="{Binding DotNetVersion}" Classes="small" />
                 </Border>
 
-                <Border Grid.Row="5" Grid.Column="0" Classes="table-cell-last-row">
+                <Border Grid.Row="4" Grid.Column="0" Classes="table-cell-last-row">
                     <TextBlock Text="Avalonia" Classes="small bold" TextWrapping="Wrap" />
                 </Border>
 
-                <Border Grid.Row="5" Grid.Column="1" Classes="table-cell-last">
+                <Border Grid.Row="4" Grid.Column="1" Classes="table-cell-last">
                     <SelectableTextBlock Text="{Binding AvaloniaVersion}" Classes="small" />
                 </Border>
             </Grid>
         </Border>
 
         <!-- Update status line -->
-        <TextBlock Grid.Row="4"
+        <StackPanel Grid.Row="3"
+                    Orientation="Horizontal"
+                    Spacing="4"
+                    IsVisible="{Binding ShowUpdateAvailableStatus}"
+                    Margin="0,0,0,8">
+            <TextBlock Text="Update available:"
+                       VerticalAlignment="Center"/>
+            <TextBlock Text="{Binding CurrentVersionDisplay}"
+                       Classes="monospace"
+                       VerticalAlignment="Center"/>
+            <TextBlock Text="→"
+                       VerticalAlignment="Center"/>
+            <TextBlock Text="{Binding LatestVersionDisplay}"
+                       Classes="monospace"
+                       VerticalAlignment="Center"/>
+            <Button Content="What's new"
+                    VerticalAlignment="Center"
+                    Margin="8,2,0,0"
+                    Classes="text"
+                    IsVisible="{Binding ShowInlineReleaseNotes}"
+                    Click="OnReleaseNotesClick"/>
+        </StackPanel>
+
+        <TextBlock Grid.Row="3"
                    Text="{Binding StatusText}"
-                   IsVisible="{Binding IsUpdateSectionVisible}"
+                   IsVisible="{Binding ShowPlainStatus}"
                    TextWrapping="Wrap"
                    Margin="0,0,0,8"/>
 
         <!-- Indeterminate progress while checking -->
-        <ProgressBar Grid.Row="5"
+        <ProgressBar Grid.Row="4"
                      IsIndeterminate="True"
                      IsVisible="{Binding IsChecking}"
                      Height="4"
                      Margin="0,0,0,8"/>
 
         <!-- Suggested upgrade command (managed + update available) -->
-        <Grid Grid.Row="6"
+        <Grid Grid.Row="5"
               ColumnDefinitions="*,Auto"
               IsVisible="{Binding HasSuggestedCommand}"
               Margin="0,0,0,12">
@@ -136,13 +151,13 @@
         <!-- Action buttons: secondary "What's new" link on the left; dismiss + the positive primary
              action ("Update now", rightmost, green) on the right. Close stays the Enter-default so an
              accidental Enter can't trigger the quit-and-relaunch update. -->
-        <Grid Grid.Row="7" ColumnDefinitions="*,Auto">
+        <Grid Grid.Row="6" ColumnDefinitions="*,Auto">
             <Button Grid.Column="0"
                     x:Name="ReleaseNotesButton"
                     Content="What's new"
                     HorizontalAlignment="Left"
                     Classes="text"
-                    IsVisible="{Binding HasReleaseNotes}"
+                    IsVisible="{Binding !ShowInlineReleaseNotes}" 
                     Click="OnReleaseNotesClick"/>
 
             <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8">
diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
index 8997645d9..4deadea9d 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
@@ -625,7 +625,7 @@
                                                                 AutomationProperties.AutomationId="ScriptFolderLink"
                                                                 AutomationProperties.Name="Open script folder in file browser"
                                                                 Command="{Binding OpenScriptFolderCommand}"
-                                                                Classes="link"
+                                                                Classes="small link"
                                                                 FontSize="10"
                                                                 Padding="0"
                                                                 Margin="0"

From 397a6fdc160e0d9ce9f6b7582141c28d0dcd2ff6 Mon Sep 17 00:00:00 2001
From: Highbyte <highbyte@outlook.com>
Date: Mon, 6 Jul 2026 20:12:53 +0200
Subject: [PATCH 3/4] Tweak menu styles

---
 .../Styles/ButtonStyles.axaml                 |  2 +-
 .../Views/MainView.axaml                      | 90 +++++++++----------
 2 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml
index 177821a6a..85a20c0d8 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml
@@ -184,7 +184,7 @@
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="BorderBrush" Value="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"/>
         <Setter Property="Foreground" Value="White"/>
-        <Setter Property="Margin" Value="0,4,0,0"/>
+        <Setter Property="Margin" Value="0,8,0,0"/>
         <Setter Property="HorizontalAlignment" Value="Stretch"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="Padding" Value="6,2"/>
diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
index 4deadea9d..739df67cd 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
@@ -196,59 +196,53 @@
                     </Grid>
 
                     <!-- Audio Settings -->
-                    <StackPanel Classes="spacing-tight" >
-                        <Grid Classes="spacing-tight">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <CheckBox Grid.Column="0"
-                                Content="Audio"
-                                AutomationProperties.AutomationId="AudioCheckBox"
-                                IsVisible="true"
-                                IsEnabled="{Binding AudioSettingsEnabled }"
-                                IsChecked="{Binding AudioEnabled}"
-                                ToolTip.Tip="{Binding AudioTooltip}"/>
-                            <Slider Grid.Column="1"
-                                AutomationProperties.AutomationId="AudioVolumeSlider"
-                                AutomationProperties.Name="Audio volume"
-                                Width="100"
-                                Minimum="0" Maximum="100"
-                                Value="{Binding AudioVolumePercent}"
-                                TickFrequency="5"
-                                IsSnapToTickEnabled="False"
-                                IsEnabled="{Binding AudioEnabled }"
-                                Classes="small"/>
-                        </Grid>
-                    </StackPanel>
+                    <Grid Classes="spacing-tight">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <CheckBox Grid.Column="0"
+                            Content="Audio"
+                            AutomationProperties.AutomationId="AudioCheckBox"
+                            IsVisible="true"
+                            IsEnabled="{Binding AudioSettingsEnabled }"
+                            IsChecked="{Binding AudioEnabled}"
+                            ToolTip.Tip="{Binding AudioTooltip}"/>
+                        <Slider Grid.Column="1"
+                            AutomationProperties.AutomationId="AudioVolumeSlider"
+                            AutomationProperties.Name="Audio volume"
+                            Minimum="0" Maximum="100"
+                            Value="{Binding AudioVolumePercent}"
+                            TickFrequency="5"
+                            IsSnapToTickEnabled="False"
+                            IsEnabled="{Binding AudioEnabled }"
+                            Classes="small"/>
+                    </Grid>
 
                     <!-- Other general functions -->
-                    <StackPanel Classes="spacing-tight" >
-                        <Grid Classes="spacing-tight">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="4" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
+                    <Grid Classes="spacing-tight">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-                            <!-- General Emulator Options Button -->
-                            <Button Grid.Column="0"
-                                    Content="Options"
-                                    AutomationProperties.AutomationId="OptionsButton"
-                                    Command="{Binding EmulatorOptionsCommand}"
-                                    Classes="grid small"
-                                    ToolTip.Tip="Configure general emulator settings"/>
+                        <!-- General Emulator Options Button -->
+                        <Button Grid.Column="0"
+                                Content="Options"
+                                AutomationProperties.AutomationId="OptionsButton"
+                                Command="{Binding EmulatorOptionsCommand}"
+                                Classes="small"
+                                ToolTip.Tip="Configure general emulator settings"/>
 
-                            <!-- About / check for updates -->
-                            <Button Grid.Column="2"
-                                    Content="About"
-                                    AutomationProperties.AutomationId="AboutButton"
-                                    Command="{Binding AboutCommand}"
-                                    Classes="grid small"
-                                    ToolTip.Tip="Version and check for updates"/>
+                        <!-- About / check for updates -->
+                        <Button Grid.Column="1"
+                                Content="About"
+                                AutomationProperties.AutomationId="AboutButton"
+                                Command="{Binding AboutCommand}"
+                                Classes="small"
+                                ToolTip.Tip="Version and check for updates"/>
 
-                       </Grid>
-                    </StackPanel>
+                   </Grid>
 
                 </StackPanel>
 

From 260f307debe6291e6c3ae418d24d244a2a867200 Mon Sep 17 00:00:00 2001
From: Highbyte <highbyte@outlook.com>
Date: Mon, 6 Jul 2026 20:17:37 +0200
Subject: [PATCH 4/4] Tweak button styles

---
 .../Styles/ButtonStyles.axaml                     | 15 +++++++++++++++
 .../Views/MainView.axaml                          |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml
index 85a20c0d8..17a301802 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Styles/ButtonStyles.axaml
@@ -149,6 +149,21 @@
         <Setter Property="Foreground" Value="{DynamicResource HighlightGold}"/>
     </Style>
 
+    <Style Selector="Button.link">
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="0,2,0,0"/>
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Foreground" Value="{DynamicResource AccentBlue}"/>
+    </Style>
+
+    <Style Selector="Button.link:pointerover">
+        <Setter Property="Foreground" Value="{DynamicResource HighlightGold}"/>
+    </Style>
+
     <!-- Small info icon buttons -->
     <Style Selector="Button.info">
         <Setter Property="FontSize" Value="10"/>
diff --git a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
index 739df67cd..1a85d7e98 100644
--- a/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
+++ b/src/apps/Avalonia/Highbyte.DotNet6502.App.Avalonia.Core/Views/MainView.axaml
@@ -622,7 +622,6 @@
                                                                 Classes="small link"
                                                                 FontSize="10"
                                                                 Padding="0"
-                                                                Margin="0"
                                                                 BorderThickness="0"
                                                                 VerticalAlignment="Center"
                                                                 ToolTip.Tip="Open script folder in file browser"/>