diff --git a/GSS2.UI.Core/MainWindow.axaml b/GSS2.UI.Core/MainWindow.axaml
index 4f786a8..dee43a5 100644
--- a/GSS2.UI.Core/MainWindow.axaml
+++ b/GSS2.UI.Core/MainWindow.axaml
@@ -7,7 +7,7 @@
     xmlns:vm="using:GSS2.UI.Core.ViewModels"
     Title="{Binding Title}"
     x:DataType="vm:MainWindowViewModel"
-    SystemDecorations="{Binding SystemDecorations}"
+    WindowDecorations="{Binding WindowDecorations}"
     Topmost="{Binding Topmost}"
     WindowState="{Binding WindowState}">
 
diff --git a/GSS2.UI.Core/MainWindow.axaml.cs b/GSS2.UI.Core/MainWindow.axaml.cs
index 0a06d29..40dc827 100644
--- a/GSS2.UI.Core/MainWindow.axaml.cs
+++ b/GSS2.UI.Core/MainWindow.axaml.cs
@@ -8,13 +8,13 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-#if DEBUG
-        this.AttachDevTools();
-#endif
+        // #if DEBUG
+        //         this.AttachDevTools();
+        // #endif
     }
 
-    public void SetControl(UserControl control)
+    public void SetControl(Control control)
     {
         MainContent.Content = control;
     }
-}
\ No newline at end of file
+}
diff --git a/GSS2.UI.Core/ViewModels/MainWindowViewModel.cs b/GSS2.UI.Core/ViewModels/MainWindowViewModel.cs
index 3625b64..f6df287 100644
--- a/GSS2.UI.Core/ViewModels/MainWindowViewModel.cs
+++ b/GSS2.UI.Core/ViewModels/MainWindowViewModel.cs
@@ -2,26 +2,17 @@ using Avalonia.Controls;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 
-using Microsoft.Extensions.Logging;
-
 namespace GSS2.UI.Core.ViewModels;
 
 public partial class MainWindowViewModel : ViewModelBase
 {
-    private readonly ILogger<MainWindowViewModel> _logger;
+    [ObservableProperty] public partial string Title { get; set; }
+    [ObservableProperty] public partial WindowDecorations WindowDecorations { get; set; }
+    [ObservableProperty] public partial bool Topmost { get; set; }
+    [ObservableProperty] public partial WindowState WindowState { get; set; }
 
-    [ObservableProperty] private string _title;
-    [ObservableProperty] private SystemDecorations _systemDecorations;
-    [ObservableProperty] private bool _topmost;
-    [ObservableProperty] private WindowState _windowState;
-
-    public MainWindowViewModel(ILogger<MainWindowViewModel> logger)
+    public MainWindowViewModel()
     {
-        _logger = logger;
-        _logger.LogInformation("Initialization");
-
         Title = "GranuSight Software 2";
-
-        _logger.LogInformation("Initialized");
     }
-}
\ No newline at end of file
+}