diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 57d31d4..0cd350c 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -1,4 +1,5 @@
 using System;
+
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -6,6 +7,7 @@ using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
 using Avalonia.Themes.Fluent;
 using Avalonia.Themes.Simple;
+
 using AvaloniaCoreRTDemo.Interfaces;
 using AvaloniaCoreRTDemo.Windows;
 
diff --git a/src/Controls/MainControl.axaml.cs b/src/Controls/MainControl.axaml.cs
index 13496ee..c3cde67 100644
--- a/src/Controls/MainControl.axaml.cs
+++ b/src/Controls/MainControl.axaml.cs
@@ -20,7 +20,7 @@ namespace AvaloniaCoreRTDemo.Controls
 
         public void Reload(IMainWindowState? model)
         {
-            if(model is not null)
+            if (model is not null)
                 this.DataContext = new MainControlViewModel(model);
         }
     }
diff --git a/src/Controls/ViewModels/MainControlViewModel.cs b/src/Controls/ViewModels/MainControlViewModel.cs
index 0254d8f..8abe745 100644
--- a/src/Controls/ViewModels/MainControlViewModel.cs
+++ b/src/Controls/ViewModels/MainControlViewModel.cs
@@ -1,8 +1,7 @@
 using System;
-using System.IO;
 
 using Avalonia.Media.Imaging;
-using AvaloniaCoreRTDemo.Interfaces;
+
 using ReactiveUI;
 
 namespace AvaloniaCoreRTDemo.Controls.ViewModels
diff --git a/src/Interfaces/IMainWindow.cs b/src/Interfaces/IMainWindow.cs
index a670e2f..36307e2 100644
--- a/src/Interfaces/IMainWindow.cs
+++ b/src/Interfaces/IMainWindow.cs
@@ -1,6 +1,4 @@
-using Avalonia.Controls;
-
-namespace AvaloniaCoreRTDemo.Interfaces
+namespace AvaloniaCoreRTDemo.Interfaces
 {
     public interface IMainWindow
     {
diff --git a/src/Interfaces/IMainWindowState.cs b/src/Interfaces/IMainWindowState.cs
index 752cdac..ea25cce 100644
--- a/src/Interfaces/IMainWindowState.cs
+++ b/src/Interfaces/IMainWindowState.cs
@@ -1,15 +1,16 @@
 using System;
+
 using Avalonia.Media.Imaging;
 
 namespace AvaloniaCoreRTDemo
 {
-	public interface IMainWindowState
-	{
+    public interface IMainWindowState
+    {
         IBitmap DotNetImage { get; }
         IBitmap AvaloniaImage { get; }
         String? Text { get; }
 
         void SetUnloadable();
-	}
+    }
 }
 
diff --git a/src/Utilities.cs b/src/Utilities.cs
index 3b740ec..7344219 100644
--- a/src/Utilities.cs
+++ b/src/Utilities.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
+
 using Avalonia;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
@@ -30,7 +31,7 @@ namespace AvaloniaCoreRTDemo
                 return GetImageFromResources("broken-link.png");
             }
         }
-        
+
         private static String GetImageFullPath(String fileName)
             => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
     }
diff --git a/src/Windows/AboutWindow.axaml b/src/Windows/AboutWindow.axaml
index 58e9b80..e1e5c51 100644
--- a/src/Windows/AboutWindow.axaml
+++ b/src/Windows/AboutWindow.axaml
@@ -10,7 +10,7 @@
 	<Grid VerticalAlignment="Top" HorizontalAlignment="Left" ColumnDefinitions="Auto,*">
 		<Image Margin="0, 60" Grid.Column="0" Stretch="None" Source="{Binding ComputerImage}" VerticalAlignment="Top" HorizontalAlignment="Left">
 		</Image>
-		<DataGrid Grid.Column="1" Items="{Binding SystemDetails}" IsReadOnly="True">
+		<DataGrid Grid.Column="1" Items="{Binding SystemDetails}" IsReadOnly="True" CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeColumns="False" HeadersVisibility="None">
 			<DataGrid.Columns>
 				<DataGridTextColumn Header="Key" Binding="{Binding Key, x:DataType=viewModels:SystemDetail}" FontWeight="Bold" />
 				<DataGridTextColumn Header="Value" Binding="{Binding Value, x:DataType=viewModels:SystemDetail}" />
diff --git a/src/Windows/AboutWindow.axaml.cs b/src/Windows/AboutWindow.axaml.cs
index e1b7aa0..acb023e 100644
--- a/src/Windows/AboutWindow.axaml.cs
+++ b/src/Windows/AboutWindow.axaml.cs
@@ -1,4 +1,5 @@
 using System;
+
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
diff --git a/src/Windows/MainWindow.axaml.cs b/src/Windows/MainWindow.axaml.cs
index 3c56369..1851b1a 100644
--- a/src/Windows/MainWindow.axaml.cs
+++ b/src/Windows/MainWindow.axaml.cs
@@ -1,10 +1,8 @@
-using System;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml;
+
 using AvaloniaCoreRTDemo.Controls;
-using AvaloniaCoreRTDemo.Controls.ViewModels;
 using AvaloniaCoreRTDemo.Interfaces;
 using AvaloniaCoreRTDemo.Windows.ViewModels;
 
@@ -14,7 +12,7 @@ namespace AvaloniaCoreRTDemo.Windows
     {
         private readonly Application? _app = App.Current;
 
-        public MainWindow() : this(default) { }        
+        public MainWindow() : this(default) { }
         public MainWindow(IMainWindow? window)
         {
             this.InitializeComponent(window);
diff --git a/src/Windows/ViewModels/AboutViewModel.cs b/src/Windows/ViewModels/AboutViewModel.cs
index e43bd95..2d88481 100644
--- a/src/Windows/ViewModels/AboutViewModel.cs
+++ b/src/Windows/ViewModels/AboutViewModel.cs
@@ -9,10 +9,10 @@ using ReactiveUI;
 namespace AvaloniaCoreRTDemo.Windows.ViewModels
 {
     internal record SystemDetail(String Key, String Value);
-    
+
     internal sealed class AboutViewModel : ReactiveObject
     {
-        
+
         private readonly IBitmap _computerImage;
         private readonly Boolean _darkTheme;
 
diff --git a/src/Windows/ViewModels/ApplicationModelBase.cs b/src/Windows/ViewModels/ApplicationModelBase.cs
index 09086e3..62c4ee6 100644
--- a/src/Windows/ViewModels/ApplicationModelBase.cs
+++ b/src/Windows/ViewModels/ApplicationModelBase.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reactive;
+
 using Avalonia.Controls;
 
 using AvaloniaCoreRTDemo.Interfaces;
@@ -46,7 +47,7 @@ namespace AvaloniaCoreRTDemo.Windows.ViewModels
             get => this._fluentDarkEnable;
             set => this.RaiseAndSetIfChanged(ref this._fluentDarkEnable, value);
         }
-        
+
         public ReactiveCommand<Unit, Unit> FileExitCommand { get; }
 
         public ApplicationModelBase(IThemeSwitch themeSwitch)
diff --git a/src/Windows/ViewModels/MainViewModel.cs b/src/Windows/ViewModels/MainViewModel.cs
index bf9d68b..b464ee2 100644
--- a/src/Windows/ViewModels/MainViewModel.cs
+++ b/src/Windows/ViewModels/MainViewModel.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Reactive;
+using Avalonia.Controls;
 
-using Avalonia.Controls;
-using AvaloniaCoreRTDemo.Controls.ViewModels;
 using AvaloniaCoreRTDemo.Interfaces;
-using ReactiveUI;
 
 namespace AvaloniaCoreRTDemo.Windows.ViewModels
 {