diff --git a/app/Desktop/Desktop.csproj b/app/Desktop/Desktop.csproj
index 6c2fb32..518c1fb 100644
--- a/app/Desktop/Desktop.csproj
+++ b/app/Desktop/Desktop.csproj
@@ -9,6 +9,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <ApplicationIcon>./Resources/icon.ico</ApplicationIcon>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
diff --git a/app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml b/app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml
index f90acf4..41fe853 100644
--- a/app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml
+++ b/app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml
@@ -5,6 +5,7 @@
         xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.CheckBox"
         mc:Ignorable="d" d:DesignWidth="500"
         x:Class="DHT.Desktop.Dialogs.CheckBox.CheckBoxDialog"
+        x:DataType="namespace:CheckBoxDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="500" SizeToContent="Height" CanResize="False"
diff --git a/app/Desktop/Dialogs/Message/MessageDialog.axaml b/app/Desktop/Dialogs/Message/MessageDialog.axaml
index 3ce2947..22a3df2 100644
--- a/app/Desktop/Dialogs/Message/MessageDialog.axaml
+++ b/app/Desktop/Dialogs/Message/MessageDialog.axaml
@@ -5,6 +5,7 @@
         xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.Message"
         mc:Ignorable="d" d:DesignWidth="500"
         x:Class="DHT.Desktop.Dialogs.Message.MessageDialog"
+        x:DataType="namespace:MessageDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="500" SizeToContent="Height" CanResize="False"
diff --git a/app/Desktop/Dialogs/Progress/ProgressDialog.axaml b/app/Desktop/Dialogs/Progress/ProgressDialog.axaml
index 8b4dc54..4e3a3dd 100644
--- a/app/Desktop/Dialogs/Progress/ProgressDialog.axaml
+++ b/app/Desktop/Dialogs/Progress/ProgressDialog.axaml
@@ -5,6 +5,7 @@
         xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.Progress"
         mc:Ignorable="d" d:DesignWidth="500"
         x:Class="DHT.Desktop.Dialogs.Progress.ProgressDialog"
+        x:DataType="namespace:ProgressDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Opened="OnOpened"
diff --git a/app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml b/app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml
index dcc3359..b671ccd 100644
--- a/app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml
+++ b/app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml
@@ -5,6 +5,7 @@
         xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.TextBox"
         mc:Ignorable="d" d:DesignWidth="500"
         x:Class="DHT.Desktop.Dialogs.TextBox.TextBoxDialog"
+        x:DataType="namespace:TextBoxDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="500" SizeToContent="Height" CanResize="False"
diff --git a/app/Desktop/Main/AboutWindow.axaml b/app/Desktop/Main/AboutWindow.axaml
index 95f8326..98dc556 100644
--- a/app/Desktop/Main/AboutWindow.axaml
+++ b/app/Desktop/Main/AboutWindow.axaml
@@ -5,6 +5,7 @@
         xmlns:main="clr-namespace:DHT.Desktop.Main"
         mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="295"
         x:Class="DHT.Desktop.Main.AboutWindow"
+        x:DataType="main:AboutWindowModel"
         Title="About Discord History Tracker"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="480" Height="295" CanResize="False"
diff --git a/app/Desktop/Main/Controls/AttachmentFilterPanel.axaml b/app/Desktop/Main/Controls/AttachmentFilterPanel.axaml
index cc1a891..9a9f489 100644
--- a/app/Desktop/Main/Controls/AttachmentFilterPanel.axaml
+++ b/app/Desktop/Main/Controls/AttachmentFilterPanel.axaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.AttachmentFilterPanel">
+             x:Class="DHT.Desktop.Main.Controls.AttachmentFilterPanel"
+             x:DataType="controls:AttachmentFilterPanelModel">
 
     <Design.DataContext>
         <controls:AttachmentFilterPanelModel />
diff --git a/app/Desktop/Main/Controls/MessageFilterPanel.axaml b/app/Desktop/Main/Controls/MessageFilterPanel.axaml
index 77c99a0..0e2c3c2 100644
--- a/app/Desktop/Main/Controls/MessageFilterPanel.axaml
+++ b/app/Desktop/Main/Controls/MessageFilterPanel.axaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.MessageFilterPanel">
+             x:Class="DHT.Desktop.Main.Controls.MessageFilterPanel"
+             x:DataType="controls:MessageFilterPanelModel">
 
     <Design.DataContext>
         <controls:MessageFilterPanelModel />
diff --git a/app/Desktop/Main/Controls/ServerConfigurationPanel.axaml b/app/Desktop/Main/Controls/ServerConfigurationPanel.axaml
index a0e286e..4025b1b 100644
--- a/app/Desktop/Main/Controls/ServerConfigurationPanel.axaml
+++ b/app/Desktop/Main/Controls/ServerConfigurationPanel.axaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.ServerConfigurationPanel">
+             x:Class="DHT.Desktop.Main.Controls.ServerConfigurationPanel"
+             x:DataType="controls:ServerConfigurationPanelModel">
 
     <Design.DataContext>
         <controls:ServerConfigurationPanelModel />
diff --git a/app/Desktop/Main/Controls/StatusBar.axaml b/app/Desktop/Main/Controls/StatusBar.axaml
index becdcf4..92ba2f3 100644
--- a/app/Desktop/Main/Controls/StatusBar.axaml
+++ b/app/Desktop/Main/Controls/StatusBar.axaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.StatusBar">
+             x:Class="DHT.Desktop.Main.Controls.StatusBar"
+             x:DataType="controls:StatusBarModel">
 
     <Design.DataContext>
         <controls:StatusBarModel />
diff --git a/app/Desktop/Main/MainWindow.axaml b/app/Desktop/Main/MainWindow.axaml
index b64c821..9d8047d 100644
--- a/app/Desktop/Main/MainWindow.axaml
+++ b/app/Desktop/Main/MainWindow.axaml
@@ -5,6 +5,7 @@
         xmlns:main="clr-namespace:DHT.Desktop.Main"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="DHT.Desktop.Main.MainWindow"
+        x:DataType="main:MainWindowModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="800" Height="500"
diff --git a/app/Desktop/Main/Pages/AdvancedPage.axaml b/app/Desktop/Main/Pages/AdvancedPage.axaml
index 637e4cb..41c9d32 100644
--- a/app/Desktop/Main/Pages/AdvancedPage.axaml
+++ b/app/Desktop/Main/Pages/AdvancedPage.axaml
@@ -5,7 +5,8 @@
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.AdvancedPage">
+             x:Class="DHT.Desktop.Main.Pages.AdvancedPage"
+             x:DataType="pages:AdvancedPageModel">
 
     <Design.DataContext>
         <pages:AdvancedPageModel />
diff --git a/app/Desktop/Main/Pages/AttachmentsPage.axaml b/app/Desktop/Main/Pages/AttachmentsPage.axaml
index a93f568..fb53a56 100644
--- a/app/Desktop/Main/Pages/AttachmentsPage.axaml
+++ b/app/Desktop/Main/Pages/AttachmentsPage.axaml
@@ -5,7 +5,8 @@
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.AttachmentsPage">
+             x:Class="DHT.Desktop.Main.Pages.AttachmentsPage"
+             x:DataType="pages:AttachmentsPageModel">
 
     <Design.DataContext>
         <pages:AttachmentsPageModel />
@@ -35,7 +36,7 @@
             <TextBlock Text="{Binding DownloadMessage}" Margin="10 0 0 0" VerticalAlignment="Center" DockPanel.Dock="Left" />
             <ProgressBar Value="{Binding DownloadProgress}" IsVisible="{Binding IsDownloading}" Margin="15 0" VerticalAlignment="Center" DockPanel.Dock="Right" />
         </DockPanel>
-        <controls:AttachmentFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !DataContext.IsDownloading, RelativeSource={RelativeSource AncestorType=UserControl}}" />
+        <controls:AttachmentFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !IsDownloading, RelativeSource={RelativeSource AncestorType=pages:AttachmentsPageModel}}" />
         <StackPanel Orientation="Vertical" Spacing="12">
             <Expander Header="Download Status" IsExpanded="True">
                 <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
diff --git a/app/Desktop/Main/Pages/DatabasePage.axaml b/app/Desktop/Main/Pages/DatabasePage.axaml
index 7cc5bd0..9f4add7 100644
--- a/app/Desktop/Main/Pages/DatabasePage.axaml
+++ b/app/Desktop/Main/Pages/DatabasePage.axaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.DatabasePage">
+             x:Class="DHT.Desktop.Main.Pages.DatabasePage"
+             x:DataType="pages:DatabasePageModel">
 
     <Design.DataContext>
         <pages:DatabasePageModel />
diff --git a/app/Desktop/Main/Pages/DebugPage.axaml b/app/Desktop/Main/Pages/DebugPage.axaml
index a6701f6..a4f2ee8 100644
--- a/app/Desktop/Main/Pages/DebugPage.axaml
+++ b/app/Desktop/Main/Pages/DebugPage.axaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.DebugPage">
+             x:Class="DHT.Desktop.Main.Pages.DebugPage"
+             x:DataType="pages:DebugPageModel">
     
     <Design.DataContext>
         <pages:DebugPageModel />
diff --git a/app/Desktop/Main/Pages/TrackingPage.axaml b/app/Desktop/Main/Pages/TrackingPage.axaml
index ea9c729..0b3696d 100644
--- a/app/Desktop/Main/Pages/TrackingPage.axaml
+++ b/app/Desktop/Main/Pages/TrackingPage.axaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.TrackingPage">
+             x:Class="DHT.Desktop.Main.Pages.TrackingPage"
+             x:DataType="pages:TrackingPageModel">
 
     <Design.DataContext>
         <pages:TrackingPageModel />
diff --git a/app/Desktop/Main/Pages/ViewerPage.axaml b/app/Desktop/Main/Pages/ViewerPage.axaml
index f6ed707..11cfdd2 100644
--- a/app/Desktop/Main/Pages/ViewerPage.axaml
+++ b/app/Desktop/Main/Pages/ViewerPage.axaml
@@ -5,7 +5,8 @@
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.ViewerPage">
+             x:Class="DHT.Desktop.Main.Pages.ViewerPage"
+             x:DataType="pages:ViewerPageModel">
 
     <Design.DataContext>
         <pages:ViewerPageModel />
diff --git a/app/Desktop/Main/Pages/ViewerPageModel.cs b/app/Desktop/Main/Pages/ViewerPageModel.cs
index 023aa1a..dd885fc 100644
--- a/app/Desktop/Main/Pages/ViewerPageModel.cs
+++ b/app/Desktop/Main/Pages/ViewerPageModel.cs
@@ -35,7 +35,7 @@ sealed class ViewerPageModel : BaseModel, IDisposable {
 		set => Change(ref hasFilters, value);
 	}
 
-	private MessageFilterPanelModel FilterModel { get; }
+	public MessageFilterPanelModel FilterModel { get; }
 
 	private readonly Window window;
 	private readonly IDatabaseFile db;
diff --git a/app/Desktop/Main/Screens/MainContentScreen.axaml b/app/Desktop/Main/Screens/MainContentScreen.axaml
index 48c0017..b62716c 100644
--- a/app/Desktop/Main/Screens/MainContentScreen.axaml
+++ b/app/Desktop/Main/Screens/MainContentScreen.axaml
@@ -5,7 +5,8 @@
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              xmlns:screens="clr-namespace:DHT.Desktop.Main.Screens"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Screens.MainContentScreen">
+             x:Class="DHT.Desktop.Main.Screens.MainContentScreen"
+             x:DataType="screens:MainContentScreenModel">
 
     <Design.DataContext>
         <screens:MainContentScreenModel />
diff --git a/app/Desktop/Main/Screens/WelcomeScreen.axaml b/app/Desktop/Main/Screens/WelcomeScreen.axaml
index 2c004fc..5879db9 100644
--- a/app/Desktop/Main/Screens/WelcomeScreen.axaml
+++ b/app/Desktop/Main/Screens/WelcomeScreen.axaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:screens="clr-namespace:DHT.Desktop.Main.Screens"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Screens.WelcomeScreen">
+             x:Class="DHT.Desktop.Main.Screens.WelcomeScreen"
+             x:DataType="screens:WelcomeScreenModel">
 
     <Design.DataContext>
         <screens:WelcomeScreenModel />