diff --git a/UI/AboutWindow.axaml.cs b/UI/AboutWindow.axaml.cs
deleted file mode 100644
index 7461811..0000000
--- a/UI/AboutWindow.axaml.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace TagHierarchyManager.UI;
-
-public partial class AboutWindow : Window
-{
-    public AboutWindow()
-    {
-        InitializeComponent();
-    }
-}
\ No newline at end of file
diff --git a/UI/Assets/Resources.resx b/UI/Assets/Resources.resx
index 30261ea..0500e67 100644
--- a/UI/Assets/Resources.resx
+++ b/UI/Assets/Resources.resx
@@ -128,4 +128,7 @@
     <data name="DatabaseSettingsDefaultTagBindings" xml:space="preserve">
         <value>Default tag bindings:</value>
     </data>
+    <data name="AboutTitleFormat" xml:space="preserve">
+        <value>About {0}</value>
+    </data>
 </root>
\ No newline at end of file
diff --git a/UI/MainWindow.axaml.cs b/UI/MainWindow.axaml.cs
deleted file mode 100644
index 745d220..0000000
--- a/UI/MainWindow.axaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace TagHierarchyManager.UI;
-
-public partial class MainWindow : Window
-{
-    public MainWindow()
-    {
-        InitializeComponent();
-    }
-}
\ No newline at end of file
diff --git a/UI/TagHierarchyManager.UI.csproj b/UI/TagHierarchyManager.UI.csproj
index 4207d2d..52acc13 100644
--- a/UI/TagHierarchyManager.UI.csproj
+++ b/UI/TagHierarchyManager.UI.csproj
@@ -33,5 +33,21 @@
         <AutoGen>True</AutoGen>
         <DependentUpon>Resources.resx</DependentUpon>
       </Compile>
+      <Compile Update="Views\AboutWindow.axaml.cs">
+        <DependentUpon>AboutWindow.axaml</DependentUpon>
+        <SubType>Code</SubType>
+      </Compile>
+      <Compile Update="Views\DatabaseSettingsWindow.axaml.cs">
+        <DependentUpon>DatabaseSettingsWindow.axaml</DependentUpon>
+        <SubType>Code</SubType>
+      </Compile>
+      <Compile Update="Views\MainWindow.axaml.cs">
+        <DependentUpon>MainWindow.axaml</DependentUpon>
+        <SubType>Code</SubType>
+      </Compile>
+      <Compile Update="App.axaml.cs">
+        <DependentUpon>App.axaml</DependentUpon>
+        <SubType>Code</SubType>
+      </Compile>
     </ItemGroup>
 </Project>
diff --git a/UI/TagHierarchyManager.UI.csproj.DotSettings b/UI/TagHierarchyManager.UI.csproj.DotSettings
new file mode 100644
index 0000000..ffe17e5
--- /dev/null
+++ b/UI/TagHierarchyManager.UI.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=views/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/UI/AboutWindow.axaml b/UI/Views/AboutWindow.axaml
similarity index 62%
rename from UI/AboutWindow.axaml
rename to UI/Views/AboutWindow.axaml
index a096de1..319d359 100644
--- a/UI/AboutWindow.axaml
+++ b/UI/Views/AboutWindow.axaml
@@ -3,14 +3,20 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:assets="clr-namespace:TagHierarchyManager.UI.Assets"
+        xmlns:ui="clr-namespace:TagHierarchyManager.UI"
         mc:Ignorable="d" d:DesignWidth="405" d:DesignHeight="140"
-        Width="405" Height="180"
+        Width="405" Height="140"
         x:Class="TagHierarchyManager.UI.AboutWindow"
-        Title="AboutWindow">
+        CanResize="False">
+    <Window.Title>
+        <MultiBinding StringFormat="{x:Static assets:Resources.AboutTitleFormat}">
+            <Binding Source="{x:Static assets:Resources.Title}"/>
+        </MultiBinding>
+    </Window.Title>
     <StackPanel HorizontalAlignment="Center" Margin="10">
         <TextBlock FontSize="30" TextAlignment="Center" Text="{x:Static assets:Resources.Title}"/>
         <TextBlock TextAlignment="Center" Text="{x:Static assets:Resources.CopyrightAndLicense}"/>
-        <HyperlinkButton HorizontalContentAlignment="Center" Content="{x:Static assets:Resources.URL}" />
-        <Button HorizontalAlignment="Center" Content="{x:Static assets:Resources.ButtonOk}"/>
+        <HyperlinkButton HorizontalContentAlignment="Center" Content="{x:Static assets:Resources.URL}" NavigateUri="{Binding ProjectUri, RelativeSource={RelativeSource AncestorType=ui:AboutWindow}}"/>
+        <Button HorizontalAlignment="Center" Content="{x:Static assets:Resources.ButtonOk}" Click="OnOKClick"/>
     </StackPanel>
 </Window>
diff --git a/UI/Views/AboutWindow.axaml.cs b/UI/Views/AboutWindow.axaml.cs
new file mode 100644
index 0000000..8221566
--- /dev/null
+++ b/UI/Views/AboutWindow.axaml.cs
@@ -0,0 +1,19 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+
+namespace TagHierarchyManager.UI;
+
+public partial class AboutWindow : Window
+{
+    public Uri ProjectUri { get; } = new(Assets.Resources.URL);
+    
+    public AboutWindow()
+    {
+        InitializeComponent();
+    }
+    
+    public void OnOKClick(object? sender, RoutedEventArgs e) => this.Close();
+}
\ No newline at end of file
diff --git a/UI/DatabaseSettingsWindow.axaml b/UI/Views/DatabaseSettingsWindow.axaml
similarity index 100%
rename from UI/DatabaseSettingsWindow.axaml
rename to UI/Views/DatabaseSettingsWindow.axaml
diff --git a/UI/DatabaseSettingsWindow.axaml.cs b/UI/Views/DatabaseSettingsWindow.axaml.cs
similarity index 100%
rename from UI/DatabaseSettingsWindow.axaml.cs
rename to UI/Views/DatabaseSettingsWindow.axaml.cs
diff --git a/UI/MainWindow.axaml b/UI/Views/MainWindow.axaml
similarity index 95%
rename from UI/MainWindow.axaml
rename to UI/Views/MainWindow.axaml
index b4a0679..7ee1081 100644
--- a/UI/MainWindow.axaml
+++ b/UI/Views/MainWindow.axaml
@@ -5,17 +5,13 @@
         xmlns:assets="clr-namespace:TagHierarchyManager.UI.Assets"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="TagHierarchyManager.UI.MainWindow"
-        Title="Tag Hierarchy Manager">
+        Title="{x:Static assets:Resources.Title}">
     <!--
     TODO:
-    - Menu bar
-    - Tag browser pane
-    - Tag editor pane
-    - Status bar
+    - Get all this working.
     -->
     <DockPanel Name="Top">
         <Menu DockPanel.Dock="Top">
-            <!-- TODO migrate to resx -->
             <MenuItem Header="{x:Static assets:Resources.MenuFile}">
                 <MenuItem Header="{x:Static assets:Resources.MenuItemNewDatabase}"/>
                 <MenuItem Header="{x:Static assets:Resources.MenuItemImport}"/>
@@ -23,7 +19,7 @@
                 <MenuItem Header="{x:Static assets:Resources.MenuItemOpen}"/>
                 <Separator/>
                 <MenuItem Header="{x:Static assets:Resources.MenuItemExport}"/>
-                <MenuItem Header="{x:Static assets:Resources.MenuItemQuit}"/>
+                <MenuItem Header="{x:Static assets:Resources.MenuItemQuit}" Click="Quit"/>
             </MenuItem>
             <MenuItem Header="{x:Static assets:Resources.MenuDatabase}">
                 <MenuItem Header="{x:Static assets:Resources.MenuItemDatabaseSettings}"/>
@@ -31,7 +27,7 @@
                 <MenuItem IsEnabled="False" Header="{x:Static assets:Resources.MenuItemTotalTagsNoDatabase}"/>
             </MenuItem>
             <MenuItem Header="{x:Static assets:Resources.MenuHelp}">
-                <MenuItem Header="_About"/>
+                <MenuItem Header="_About" Click="OpenAboutWindow"/>
             </MenuItem>
         </Menu>
         <TextBlock Name="StatusBlock" DockPanel.Dock="Bottom" Margin="5 5 0 5 " Text="{x:Static assets:Resources.StatusBlockReady}"/>
diff --git a/UI/Views/MainWindow.axaml.cs b/UI/Views/MainWindow.axaml.cs
new file mode 100644
index 0000000..1c15e45
--- /dev/null
+++ b/UI/Views/MainWindow.axaml.cs
@@ -0,0 +1,17 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace TagHierarchyManager.UI;
+
+public partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+    }
+    
+    public void OpenAboutWindow(object? sender, RoutedEventArgs e) => new AboutWindow().ShowDialog(this);
+    public void Quit(object? sender, RoutedEventArgs e) => this.Close();
+}
\ No newline at end of file