diff --git a/Tests/UI.Tests/UI.Tests.csproj b/Tests/UI.Tests/UI.Tests.csproj
index 67f5aed..bc46130 100644
--- a/Tests/UI.Tests/UI.Tests.csproj
+++ b/Tests/UI.Tests/UI.Tests.csproj
@@ -5,6 +5,7 @@
     <LangVersion>9</LangVersion>
     <Nullable>enable</Nullable>
     <TargetFrameworks>net5.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
diff --git a/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj b/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj
index 6a1ae30..1793862 100644
--- a/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj
+++ b/samples/Aura.UI.Gallery/Aura.UI.Gallery.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\20000.jpg" />
diff --git a/samples/Aura.UI.Gallery/Views/MainWindow.axaml b/samples/Aura.UI.Gallery/Views/MainWindow.axaml
index f3a0656..a65599f 100644
--- a/samples/Aura.UI.Gallery/Views/MainWindow.axaml
+++ b/samples/Aura.UI.Gallery/Views/MainWindow.axaml
@@ -19,11 +19,10 @@
         Classes="us_c"> <!-- MinWidth="1171"  -->
   <Grid Margin="{Binding #win.OffScreenMargin}" >
     <vw:MainView/>
-    <Border Background="Transparent" 
+    <Border Name="DragBorder"
+            Background="Transparent" 
             VerticalAlignment="Top" 
-            Height="19"
-            PointerPressed="EnableDrag"
-            DoubleTapped="DoubleTappedTitleBar"/>
+            Height="19"/>
     <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10">
       <StackPanel.Styles>
         <Style Selector="ComboBox">
diff --git a/samples/Aura.UI.Gallery/Views/MainWindow.axaml.cs b/samples/Aura.UI.Gallery/Views/MainWindow.axaml.cs
index 3cadce1..8bd6a79 100644
--- a/samples/Aura.UI.Gallery/Views/MainWindow.axaml.cs
+++ b/samples/Aura.UI.Gallery/Views/MainWindow.axaml.cs
@@ -19,29 +19,10 @@ public MainWindow()
 #if DEBUG
             this.AttachDevTools();
 #endif
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        public void EnableDrag(object sender, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-        
-        public void DoubleTappedTitleBar(object sender, RoutedEventArgs e)
-        {
-            switch (WindowState)
+            DragBorder.PointerPressed += (s, e) =>
             {
-                case WindowState.Maximized: 
-                    WindowState = WindowState.Normal;
-                    break;
-                case WindowState.Normal:
-                    WindowState = WindowState.Maximized;
-                    break;
-            }
+                BeginMoveDrag(e);
+            };
         }
     }
 }