diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs
index 22eeb33a1..c36d7129e 100644
--- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs
+++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs
@@ -116,7 +116,7 @@ namespace Artemis.UI.Shared
                 index++;
             }
 
-            ListCount = index + 1;
+            ListCount = index;
 
             while (ListChildren.Count > ListCount)
                 ListChildren.RemoveAt(ListChildren.Count - 1);
diff --git a/src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorView.xaml b/src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorView.xaml
index 74871b8ed..49af71b72 100644
--- a/src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorView.xaml
+++ b/src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorView.xaml
@@ -39,6 +39,9 @@
             </VisualBrush.Visual>
         </VisualBrush>
     </UserControl.Resources>
+    <UserControl.InputBindings>
+        <KeyBinding Key="Delete" Command="{s:Action RemoveColorStop}" CommandParameter="{Binding SelectedColorStopViewModel}"/>
+    </UserControl.InputBindings>
     <Grid Margin="16">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
diff --git a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
index 729c67a9a..f2c0b8995 100644
--- a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
@@ -66,11 +66,16 @@
             </StackPanel>
 
         </Grid>
-        <TreeView Grid.Row="1" ItemsSource="{Binding MainDataModel.Children}" HorizontalContentAlignment="Stretch">
+        <TreeView Grid.Row="1" 
+                  ItemsSource="{Binding MainDataModel.Children}"
+                  HorizontalContentAlignment="Stretch"
+                  VirtualizingStackPanel.IsVirtualizing="True"
+                  VirtualizingStackPanel.VirtualizationMode="Recycling">
             <TreeView.Resources>
                 <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource MaterialDesignTreeViewItem}">
                     <Setter Property="IsExpanded" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />
                 </Style>
+
                 <HierarchicalDataTemplate DataType="{x:Type dataModel:DataModelPropertiesViewModel}" ItemsSource="{Binding Children}">
                     <Grid>
                         <Grid.ColumnDefinitions>
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
index 917024ec6..306928fee 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
@@ -281,7 +281,6 @@ namespace Artemis.UI.Screens.SurfaceEditor
         // ReSharper disable once UnusedMember.Global - Called from view
         public void EditorGridMouseMove(object sender, MouseEventArgs e)
         {
-            ((Grid) sender).Focus();
             // If holding down Ctrl, pan instead of move/select
             if (IsPanKeyDown())
             {
diff --git a/src/Artemis.UI/Screens/TrayViewModel.cs b/src/Artemis.UI/Screens/TrayViewModel.cs
index c17ab70ae..c755054af 100644
--- a/src/Artemis.UI/Screens/TrayViewModel.cs
+++ b/src/Artemis.UI/Screens/TrayViewModel.cs
@@ -49,16 +49,16 @@ namespace Artemis.UI.Screens
             windowService.ConfigureMainWindowProvider(this);
             messageService.ConfigureNotificationProvider(this);
             bool autoRunning = Bootstrapper.StartupArguments.Contains("--autorun");
+            bool minimized = Bootstrapper.StartupArguments.Contains("--minimized");
             bool showOnAutoRun = settingsService.GetSetting("UI.ShowOnStartup", true).Value;
-            if (!autoRunning || showOnAutoRun)
+
+            if (autoRunning && !showOnAutoRun || minimized)
+                coreService.Initialized += (_, _) => updateService.AutoUpdate();
+            else
             {
                 ShowSplashScreen();
                 coreService.Initialized += (_, _) => TrayBringToForeground();
             }
-            else
-            {
-                coreService.Initialized += (_, _) => updateService.AutoUpdate();
-            }
         }
 
         public void TrayBringToForeground()