diff --git a/Source/HangoverAvalonia/Controls/CheckedListBox.axaml b/Source/HangoverAvalonia/Controls/CheckedListBox.axaml
index f797e06b..df1c6319 100644
--- a/Source/HangoverAvalonia/Controls/CheckedListBox.axaml
+++ b/Source/HangoverAvalonia/Controls/CheckedListBox.axaml
@@ -8,7 +8,7 @@
 	<UserControl.Resources>
 		<RecyclePool x:Key="RecyclePool" />
 		<DataTemplate x:Key="queuedBook">
-			<CheckBox Margin="10,0,0,0" Content="{Binding Item}" IsChecked="{Binding IsChecked, Mode=TwoWay}" />
+			<CheckBox HorizontalAlignment="Stretch" Margin="10,0,0,0" Content="{Binding Item}" IsChecked="{Binding IsChecked, Mode=TwoWay}" />
 		</DataTemplate>
 		<RecyclingElementFactory x:Key="elementFactory" RecyclePool="{StaticResource RecyclePool}">
 			<RecyclingElementFactory.Templates>
diff --git a/Source/HangoverAvalonia/HangoverAvalonia.csproj b/Source/HangoverAvalonia/HangoverAvalonia.csproj
index 40795aff..c00bc51c 100644
--- a/Source/HangoverAvalonia/HangoverAvalonia.csproj
+++ b/Source/HangoverAvalonia/HangoverAvalonia.csproj
@@ -55,6 +55,9 @@
 		<Compile Update="ViewModels\MainVM.*.cs">
 			<DependentUpon>MainVM.cs</DependentUpon>
 		</Compile>
+		<Compile Update="Views\MainWindow.*.cs">
+			<DependentUpon>MainWindow.axaml</DependentUpon>
+		</Compile>
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj
index b31929d4..7059f5fa 100644
--- a/Source/LibationAvalonia/LibationAvalonia.csproj
+++ b/Source/LibationAvalonia/LibationAvalonia.csproj
@@ -18,95 +18,98 @@
 		<StartupObject />
 	</PropertyGroup>
 
-  <PropertyGroup>
-    <!--
+	<PropertyGroup>
+		<!--
     HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
     - Not using SatelliteResourceLanguages will load all language packs: works
     - Specifying 'en' semicolon 1 more should load 1 language pack: works
     - Specifying only 'en' should load no language packs: broken, still loads all
     -->
-    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
-  </PropertyGroup>
+		<SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-	  <OutputPath>..\bin\Avalonia\Debug</OutputPath>
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<OutputPath>..\bin\Avalonia\Debug</OutputPath>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-	  <OutputPath>..\bin\Avalonia\Release</OutputPath>
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
-	
-<ItemGroup>
-    <AvaloniaResource Include="Assets\**" />
-	<None Remove=".gitignore" />
-    <None Remove="Assets\Asterisk.png" />
-    <None Remove="Assets\cancel.png" />
-    <None Remove="Assets\completed.png" />
-    <None Remove="Assets\down.png" />
-    <None Remove="Assets\download-arrow.png" />
-    <None Remove="Assets\edit-tags-25x25.png" />
-    <None Remove="Assets\edit-tags-50x50.png" />
-    <None Remove="Assets\edit_25x25.png" />
-    <None Remove="Assets\edit_64x64.png" />
-    <None Remove="Assets\error.png" />
-    <None Remove="Assets\errored.png" />
-    <None Remove="Assets\Exclamation.png" />
-    <None Remove="Assets\first.png" />
-    <None Remove="Assets\glass-with-glow_16.png" />
-    <None Remove="Assets\img-coverart-prod-unavailable_300x300.jpg" />
-    <None Remove="Assets\img-coverart-prod-unavailable_500x500.jpg" />
-    <None Remove="Assets\img-coverart-prod-unavailable_80x80.jpg" />
-    <None Remove="Assets\import_16x16.png" />
-    <None Remove="Assets\last.png" />
-    <None Remove="Assets\libation.ico" />
-    <None Remove="Assets\LibationStyles.xaml" />
-    <None Remove="Assets\liberate_green.png" />
-    <None Remove="Assets\liberate_green_pdf_no.png" />
-    <None Remove="Assets\liberate_green_pdf_yes.png" />
-    <None Remove="Assets\liberate_red.png" />
-    <None Remove="Assets\liberate_red_pdf_no.png" />
-    <None Remove="Assets\liberate_red_pdf_yes.png" />
-    <None Remove="Assets\liberate_yellow.png" />
-    <None Remove="Assets\liberate_yellow_pdf_no.png" />
-    <None Remove="Assets\liberate_yellow_pdf_yes.png" />
-    <None Remove="Assets\MBIcons\Asterisk.png" />
-    <None Remove="Assets\MBIcons\error.png" />
-    <None Remove="Assets\MBIcons\Exclamation.png" />
-    <None Remove="Assets\MBIcons\Question.png" />
-    <None Remove="Assets\minus.png" />
-    <None Remove="Assets\plus.png" />
-    <None Remove="Assets\Question.png" />
-    <None Remove="Assets\queued.png" />
-    <None Remove="Assets\up.png" />
-  </ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<OutputPath>..\bin\Avalonia\Release</OutputPath>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-    <ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
-    <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<AvaloniaResource Include="Assets\**" />
+		<None Remove=".gitignore" />
+		<None Remove="Assets\Asterisk.png" />
+		<None Remove="Assets\cancel.png" />
+		<None Remove="Assets\completed.png" />
+		<None Remove="Assets\down.png" />
+		<None Remove="Assets\download-arrow.png" />
+		<None Remove="Assets\edit-tags-25x25.png" />
+		<None Remove="Assets\edit-tags-50x50.png" />
+		<None Remove="Assets\edit_25x25.png" />
+		<None Remove="Assets\edit_64x64.png" />
+		<None Remove="Assets\error.png" />
+		<None Remove="Assets\errored.png" />
+		<None Remove="Assets\Exclamation.png" />
+		<None Remove="Assets\first.png" />
+		<None Remove="Assets\glass-with-glow_16.png" />
+		<None Remove="Assets\img-coverart-prod-unavailable_300x300.jpg" />
+		<None Remove="Assets\img-coverart-prod-unavailable_500x500.jpg" />
+		<None Remove="Assets\img-coverart-prod-unavailable_80x80.jpg" />
+		<None Remove="Assets\import_16x16.png" />
+		<None Remove="Assets\last.png" />
+		<None Remove="Assets\libation.ico" />
+		<None Remove="Assets\LibationStyles.xaml" />
+		<None Remove="Assets\liberate_green.png" />
+		<None Remove="Assets\liberate_green_pdf_no.png" />
+		<None Remove="Assets\liberate_green_pdf_yes.png" />
+		<None Remove="Assets\liberate_red.png" />
+		<None Remove="Assets\liberate_red_pdf_no.png" />
+		<None Remove="Assets\liberate_red_pdf_yes.png" />
+		<None Remove="Assets\liberate_yellow.png" />
+		<None Remove="Assets\liberate_yellow_pdf_no.png" />
+		<None Remove="Assets\liberate_yellow_pdf_yes.png" />
+		<None Remove="Assets\MBIcons\Asterisk.png" />
+		<None Remove="Assets\MBIcons\error.png" />
+		<None Remove="Assets\MBIcons\Exclamation.png" />
+		<None Remove="Assets\MBIcons\Question.png" />
+		<None Remove="Assets\minus.png" />
+		<None Remove="Assets\plus.png" />
+		<None Remove="Assets\Question.png" />
+		<None Remove="Assets\queued.png" />
+		<None Remove="Assets\up.png" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+		<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
+		<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Update="Properties\Resources.Designer.cs">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+		<Compile Update="Views\MainWindow.*.cs">
+			<DependentUpon>MainWindow.axaml</DependentUpon>
+		</Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+		<EmbeddedResource Update="Properties\Resources.resx">
+			<Generator>ResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+	</ItemGroup>
+
+	<ItemGroup>
+		<UpToDateCheckInput Remove="Controls\GroupBox.axaml" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <UpToDateCheckInput Remove="Controls\GroupBox.axaml" />
-  </ItemGroup>
-	
 	<ItemGroup>
 		<PackageReference Include="Avalonia" Version="11.0.0-preview4" />
 		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0-preview4" />
@@ -120,16 +123,16 @@
 
 
 	<ItemGroup>
-    <None Update="glass-with-glow_256.svg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Libation.desktop">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="ZipExtractor.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+		<None Update="glass-with-glow_256.svg">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Libation.desktop">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="ZipExtractor.exe">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
 
 
 	<Target Name="SpicNSpan" AfterTargets="Clean">
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.BackupCounts.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.BackupCounts.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.BackupCounts.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.BackupCounts.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.Export.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.Export.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.Export.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.Export.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.Filter.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.Filter.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.Filter.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.Filter.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.Liberate.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.Liberate.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.Liberate.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.Liberate.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow._NoUI.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.NoUI.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow._NoUI.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.NoUI.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.ProcessQueue.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.ProcessQueue.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.QuickFilters.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.QuickFilters.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.QuickFilters.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.QuickFilters.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.RemoveBooks.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.RemoveBooks.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanAuto.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.ScanAuto.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanAuto.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.ScanAuto.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanManual.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.ScanManual.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanManual.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.ScanManual.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanNotification.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.ScanNotification.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.ScanNotification.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.ScanNotification.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.Settings.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.Settings.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.Settings.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.Settings.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.VisibleBooks.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.VisibleBooks.cs
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml b/Source/LibationAvalonia/Views/MainWindow.axaml
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml
rename to Source/LibationAvalonia/Views/MainWindow.axaml
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.axaml.cs
similarity index 100%
rename from Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs
rename to Source/LibationAvalonia/Views/MainWindow.axaml.cs