diff --git a/.gitignore b/.gitignore
index 0f341c9..08d91ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -345,6 +345,11 @@
 !/FMODCoreAPI/Assets/ARM64
 !/FMODCoreAPI/Assets/x64
 
+/Language/Assets/Client.json
+
+!/LedCSharp/Assets/ARM64
+!/LedCSharp/Assets/x64
+
 !/Qwilight/Assets/ARM64
 /Qwilight/Assets/ARM64/Flint.exe
 /Qwilight/Assets/ARM64/Igniter.exe
@@ -356,19 +361,14 @@
 /Qwilight/Assets/x64/NVIDIA.dll
 /Qwilight/Assets/x64/Xwindow.exe
 
-/Language/Assets/Client.json
-
-!/LedCSharp/Assets/ARM64
-!/LedCSharp/Assets/x64
-
 !/Qwilight/Protobuf/protoc.exe
 !/Qwilight/Protobuf/protoc-gen-js.exe
 
-!/Qwilight/sdk/tools/ContentBuilder/builder/steamcmd
-!/Qwilight/sdk/tools/ContentBuilder/scripts/simple_app_build.vdf
-/Qwilight/sdk/tools/ContentBuilder/builder
-/Qwilight/sdk/tools/ContentBuilder/output
+/Test/qpdgo
 
-/Qwilight.zip
+!/sdk/tools/ContentBuilder/builder/steamcmd.exe
+!/sdk/tools/ContentBuilder/scripts/simple_app_build.vdf
+/sdk/tools/ContentBuilder/builder
+/sdk/tools/ContentBuilder/output
 
-/Test/qpdgo
\ No newline at end of file
+/Qwilight.zip
\ No newline at end of file
diff --git a/Qwilight.cmd b/Qwilight.cmd
index c269b86..0e19a26 100644
--- a/Qwilight.cmd
+++ b/Qwilight.cmd
@@ -52,7 +52,7 @@
 	SET /P PW=PW: 
 )
 IF %VALVE% == 1 (
-	Qwilight\sdk\tools\ContentBuilder\builder\steamcmd +login %ID% %PW% +run_app_build ..\scripts\simple_app_build.vdf +quit
+	sdk\tools\ContentBuilder\builder\steamcmd +login %ID% %PW% +run_app_build ..\scripts\simple_app_build.vdf +quit
 )
 IF %VALVE% == 1 (
 	IF %ERRORLEVEL% == 0  (
diff --git a/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml b/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml
index 8a5cc80..4c457c8 100644
--- a/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml
+++ b/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml
@@ -1,115 +1,112 @@
-<ContentControl
+<Grid 
     x:Class="Qwilight.View.EntryView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:quic="clr-namespace:Qwilight.UIComponent"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    DataContext="{Binding MainValue, Source={StaticResource ViewModels}}"
-    IsEnabled="{Binding IsDefaultEntryLoading, Converter={StaticResource NotModifier}}">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Grid Margin="{Binding EntryViewTitleMargin, Source={StaticResource BaseUI}}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <ComboBox Style="{StaticResource StandardItemsInput}" x:Name="FitInput" SelectedItem="{Binding FitModeValue, Source={StaticResource Configure}, UpdateSourceTrigger=PropertyChanged}" ToolTipService.ToolTip="{Binding FitAssist, Source={StaticResource LanguageSystem}}" SelectionChanged="OnWant" DropDownClosed="OnFitMode" Visibility="{Binding LastDefaultEntryItem, Source={StaticResource Configure}, Converter={StaticResource VisibilityModifier}}">
-                <ComboBox.Items>
-                    <quic:FitMode Mode="{StaticResource FitModeTitle}" />
-                    <quic:FitMode Mode="{StaticResource FitModeArtist}" />
-                    <quic:FitMode Mode="{StaticResource FitModeEntryPath}" />
-                    <quic:FitMode Mode="{StaticResource FitModeModifiedDate}" />
-                    <quic:FitMode Mode="{StaticResource FitModeHandledCount}" />
-                    <quic:FitMode Mode="{StaticResource FitModeLatestDate}" />
-                    <quic:FitMode Mode="{StaticResource FitModeLength}" />
-                    <quic:FitMode Mode="{StaticResource FitModeLevelTextValue}" />
-                    <quic:FitMode Mode="{StaticResource FitModeAverageInputCount}" />
-                    <quic:FitMode Mode="{StaticResource FitModeHighestInputCount}" />
-                    <quic:FitMode Mode="{StaticResource FitModeTotalNotes}" />
-                    <quic:FitMode Mode="{StaticResource FitModeBPM}" />
-                </ComboBox.Items>
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <Image Style="{StaticResource StandardViewMargin0}" Source="{Binding Drawing}" Height="12" HorizontalAlignment="Left" />
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-            <TextBox Grid.Column="1" x:Name="WantInput" Style="{StaticResource StandardTextInput}" Text="{Binding InputWant, Source={StaticResource Configure}, UpdateSourceTrigger=PropertyChanged}" materialDesign:HintAssist.Hint="{Binding InputWantAssist, Source={StaticResource LanguageSystem}}" TextChanged="OnWant" GotFocus="OnSetInputWantPoint" LostFocus="OnSetInputWantNotPoint" />
-            <Button Grid.Column="2" VerticalAlignment="Stretch" Style="{StaticResource StandardInput}" Content="{Binding WantLevelNameText, Source={StaticResource Configure}}" Command="{Binding LevelWindowCommand}" />
-            <Button Grid.Column="3" VerticalAlignment="Stretch" Style="{StaticResource StandardInput}" Command="{Binding WantWindowCommand}" Foreground="{Binding InputWantWindowPaint, Source={StaticResource Configure}}">🔍</Button>
-        </Grid>
-        <ListView Grid.Row="1" Style="{StaticResource PointableNoteFilesView}" x:Name="EntryItemsView" SelectedItem="{Binding EntryItemValue}" SelectedIndex="{Binding EntryItemPosition}" ItemsSource="{Binding EntryItems}" PreviewKeyDown="OnEntryViewInputLower">
-            <ListView.ItemTemplate>
+    DataContext="{Binding MainValue, Source={StaticResource ViewModels}}">
+    <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+    <Grid Margin="{Binding EntryViewTitleMargin, Source={StaticResource BaseUI}}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <ComboBox Style="{StaticResource StandardItemsInput}" x:Name="FitInput" SelectedItem="{Binding FitModeValue, Source={StaticResource Configure}, UpdateSourceTrigger=PropertyChanged}" ToolTipService.ToolTip="{Binding FitAssist, Source={StaticResource LanguageSystem}}" SelectionChanged="OnWant" DropDownClosed="OnFitMode" Visibility="{Binding LastDefaultEntryItem, Source={StaticResource Configure}, Converter={StaticResource VisibilityModifier}}">
+            <ComboBox.Items>
+                <quic:FitMode Mode="{StaticResource FitModeTitle}" />
+                <quic:FitMode Mode="{StaticResource FitModeArtist}" />
+                <quic:FitMode Mode="{StaticResource FitModeEntryPath}" />
+                <quic:FitMode Mode="{StaticResource FitModeModifiedDate}" />
+                <quic:FitMode Mode="{StaticResource FitModeHandledCount}" />
+                <quic:FitMode Mode="{StaticResource FitModeLatestDate}" />
+                <quic:FitMode Mode="{StaticResource FitModeLength}" />
+                <quic:FitMode Mode="{StaticResource FitModeLevelTextValue}" />
+                <quic:FitMode Mode="{StaticResource FitModeAverageInputCount}" />
+                <quic:FitMode Mode="{StaticResource FitModeHighestInputCount}" />
+                <quic:FitMode Mode="{StaticResource FitModeTotalNotes}" />
+                <quic:FitMode Mode="{StaticResource FitModeBPM}" />
+            </ComboBox.Items>
+            <ComboBox.ItemTemplate>
                 <DataTemplate>
-                    <Grid Height="{Binding EntryItemHeight, Source={StaticResource BaseUI}}" Background="Transparent" MouseDown="OnLevyNoteFile" PreviewMouseDown="OnEntryViewPointLower">
-                        <Grid Visibility="{Binding NoteFile.IsAltDrawing, Converter={StaticResource VisibilityNotModifier}}">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition />
-                                </Grid.ColumnDefinitions>
-                                <Border Style="{StaticResource StandardPanelSquareMargin0}" BorderBrush="{Binding NoteFile.LevelPaint}" BorderThickness="0 0 1 0">
-                                    <Image Source="{Binding NoteFile.NoteDrawing}" Width="{Binding EntryItemHeight, Source={StaticResource BaseUI}}" Stretch="Fill" />
-                                </Border>
-                                <Image Grid.Column="1" Source="{Binding NoteFile.HandledWallDrawing}" Width="{Binding HandledWallLength, Source={StaticResource BaseUI}}" Stretch="Fill" />
-                                <Grid Grid.Column="2">
-                                    <StackPanel VerticalAlignment="Center">
-                                        <StackPanel Orientation="Horizontal">
-                                            <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.LevelText}" Foreground="{Binding NoteFile.LevelValue, Converter={StaticResource LevelPaintModifier}}" FontSize="{Binding LevelFontLevel, Source={StaticResource BaseUI}}" />
-                                            <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.WantLevelID}" Foreground="{StaticResource WantLevelIDPaint}" FontSize="{Binding WantLevelIDFontLevel, Source={StaticResource BaseUI}}" />
-                                            <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding EventNoteName}" Foreground="{StaticResource EventNoteNamePaint}" FontSize="{Binding EventNoteNameFontLevel, Source={StaticResource BaseUI}}" />
-                                            <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.Title}" Foreground="{StaticResource TitlePaint}" FontSize="{Binding TitleFontLevel, Source={StaticResource BaseUI}}" />
-                                        </StackPanel>
-                                        <StackPanel Orientation="Horizontal">
-                                            <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding PositionText}" FontSize="{Binding EntryItemPositionFontLevel, Source={StaticResource BaseUI}}" />
-                                            <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding FittedText}" Foreground="{StaticResource FittedTextPaint}" FontSize="{Binding FittedTextFontLevel, Source={StaticResource BaseUI}}" />
-                                            <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.Artist}" Foreground="{StaticResource ArtistPaint}" FontSize="{Binding ArtistFontLevel, Source={StaticResource BaseUI}}" />
-                                            <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.GenreText}" Foreground="{StaticResource GenrePaint}" FontSize="{Binding GenreFontLevel, Source={StaticResource BaseUI}}" />
-                                        </StackPanel>
-                                    </StackPanel>
-                                    <Image Source="{Binding NoteFile.BannerDrawing}" Visibility="{Binding NoteFile.BannerDrawing, Converter={StaticResource VisibilityModifier}}" HorizontalAlignment="Right">
-                                        <Image.OpacityMask>
-                                            <LinearGradientBrush StartPoint="0.0,0.0" EndPoint="1.0,0.0">
-                                                <LinearGradientBrush.GradientStops>
-                                                    <GradientStop Offset="0" Color="Transparent" />
-                                                    <GradientStop Offset="1" Color="Black" />
-                                                </LinearGradientBrush.GradientStops>
-                                            </LinearGradientBrush>
-                                        </Image.OpacityMask>
-                                    </Image>
-                                </Grid>
-                            </Grid>
-                            <Image Source="{Binding FavoriteNoteFileDrawing, Source={StaticResource BaseUI}}" HorizontalAlignment="Left" Visibility="{Binding NoteFile.HasFavoriteEntryItem, Converter={StaticResource VisibilityModifier}}" />
-                        </Grid>
-                        <Image Style="{StaticResource StandardView}" Source="{Binding NoteFile.LogicalDrawing}" />
-                        <Grid Visibility="{Binding NoteFile.EssentialDrawing, Converter={StaticResource VisibilityModifier}}">
+                    <Image Style="{StaticResource StandardViewMargin0}" Source="{Binding Drawing}" Height="12" HorizontalAlignment="Left" />
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+        <TextBox Grid.Column="1" x:Name="WantInput" Style="{StaticResource StandardTextInput}" Text="{Binding InputWant, Source={StaticResource Configure}, UpdateSourceTrigger=PropertyChanged}" materialDesign:HintAssist.Hint="{Binding InputWantAssist, Source={StaticResource LanguageSystem}}" TextChanged="OnWant" GotFocus="OnSetInputWantPoint" LostFocus="OnSetInputWantNotPoint" />
+        <Button Grid.Column="2" VerticalAlignment="Stretch" Style="{StaticResource StandardInput}" Content="{Binding WantLevelNameText, Source={StaticResource Configure}}" Command="{Binding LevelWindowCommand}" />
+        <Button Grid.Column="3" VerticalAlignment="Stretch" Style="{StaticResource StandardInput}" Command="{Binding WantWindowCommand}" Foreground="{Binding InputWantWindowPaint, Source={StaticResource Configure}}">🔍</Button>
+    </Grid>
+    <ListView Grid.Row="1" Style="{StaticResource PointableNoteFilesView}" x:Name="EntryItemsView" SelectedItem="{Binding EntryItemValue}" SelectedIndex="{Binding EntryItemPosition}" ItemsSource="{Binding EntryItems}" PreviewKeyDown="OnEntryViewInputLower">
+        <ListView.ItemTemplate>
+            <DataTemplate>
+                <Grid Height="{Binding EntryItemHeight, Source={StaticResource BaseUI}}" Background="Transparent" MouseDown="OnLevyNoteFile" PreviewMouseDown="OnEntryViewPointLower">
+                    <Grid Visibility="{Binding NoteFile.IsAltDrawing, Converter={StaticResource VisibilityNotModifier}}">
+                        <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <Image Style="{StaticResource StandardView}" Source="{Binding NoteFile.EssentialDrawing}" />
-                            <Grid Grid.Column="1">
+                            <Border Style="{StaticResource StandardPanelSquareMargin0}" BorderBrush="{Binding NoteFile.LevelPaint}" BorderThickness="0 0 1 0">
+                                <Image Source="{Binding NoteFile.NoteDrawing}" Width="{Binding EntryItemHeight, Source={StaticResource BaseUI}}" Stretch="Fill" />
+                            </Border>
+                            <Image Grid.Column="1" Source="{Binding NoteFile.HandledWallDrawing}" Width="{Binding HandledWallLength, Source={StaticResource BaseUI}}" Stretch="Fill" />
+                            <Grid Grid.Column="2">
                                 <StackPanel VerticalAlignment="Center">
                                     <StackPanel Orientation="Horizontal">
+                                        <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.LevelText}" Foreground="{Binding NoteFile.LevelValue, Converter={StaticResource LevelPaintModifier}}" FontSize="{Binding LevelFontLevel, Source={StaticResource BaseUI}}" />
                                         <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.WantLevelID}" Foreground="{StaticResource WantLevelIDPaint}" FontSize="{Binding WantLevelIDFontLevel, Source={StaticResource BaseUI}}" />
+                                        <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding EventNoteName}" Foreground="{StaticResource EventNoteNamePaint}" FontSize="{Binding EventNoteNameFontLevel, Source={StaticResource BaseUI}}" />
                                         <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.Title}" Foreground="{StaticResource TitlePaint}" FontSize="{Binding TitleFontLevel, Source={StaticResource BaseUI}}" />
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal">
-                                        <TextBlock Style="{StaticResource VNarrowTextView}" Text="{Binding PositionText}" FontSize="{Binding EntryItemPositionFontLevel, Source={StaticResource BaseUI}}" />
+                                        <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding PositionText}" FontSize="{Binding EntryItemPositionFontLevel, Source={StaticResource BaseUI}}" />
+                                        <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding FittedText}" Foreground="{StaticResource FittedTextPaint}" FontSize="{Binding FittedTextFontLevel, Source={StaticResource BaseUI}}" />
                                         <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.Artist}" Foreground="{StaticResource ArtistPaint}" FontSize="{Binding ArtistFontLevel, Source={StaticResource BaseUI}}" />
+                                        <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.GenreText}" Foreground="{StaticResource GenrePaint}" FontSize="{Binding GenreFontLevel, Source={StaticResource BaseUI}}" />
                                     </StackPanel>
                                 </StackPanel>
+                                <Image Source="{Binding NoteFile.BannerDrawing}" Visibility="{Binding NoteFile.BannerDrawing, Converter={StaticResource VisibilityModifier}}" HorizontalAlignment="Right">
+                                    <Image.OpacityMask>
+                                        <LinearGradientBrush StartPoint="0.0,0.0" EndPoint="1.0,0.0">
+                                            <LinearGradientBrush.GradientStops>
+                                                <GradientStop Offset="0" Color="Transparent" />
+                                                <GradientStop Offset="1" Color="Black" />
+                                            </LinearGradientBrush.GradientStops>
+                                        </LinearGradientBrush>
+                                    </Image.OpacityMask>
+                                </Image>
                             </Grid>
                         </Grid>
+                        <Image Source="{Binding FavoriteNoteFileDrawing, Source={StaticResource BaseUI}}" HorizontalAlignment="Left" Visibility="{Binding NoteFile.HasFavoriteEntryItem, Converter={StaticResource VisibilityModifier}}" />
                     </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </Grid>
-</ContentControl>
\ No newline at end of file
+                    <Image Style="{StaticResource StandardView}" Source="{Binding NoteFile.LogicalDrawing}" />
+                    <Grid Visibility="{Binding NoteFile.EssentialDrawing, Converter={StaticResource VisibilityModifier}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Image Style="{StaticResource StandardView}" Source="{Binding NoteFile.EssentialDrawing}" />
+                        <Grid Grid.Column="1">
+                            <StackPanel VerticalAlignment="Center">
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.WantLevelID}" Foreground="{StaticResource WantLevelIDPaint}" FontSize="{Binding WantLevelIDFontLevel, Source={StaticResource BaseUI}}" />
+                                    <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.Title}" Foreground="{StaticResource TitlePaint}" FontSize="{Binding TitleFontLevel, Source={StaticResource BaseUI}}" />
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Style="{StaticResource VNarrowTextView}" Text="{Binding PositionText}" FontSize="{Binding EntryItemPositionFontLevel, Source={StaticResource BaseUI}}" />
+                                    <TextBlock Style="{StaticResource VNarrowTextView}" HorizontalAlignment="Left" Text="{Binding NoteFile.Artist}" Foreground="{StaticResource ArtistPaint}" FontSize="{Binding ArtistFontLevel, Source={StaticResource BaseUI}}" />
+                                </StackPanel>
+                            </StackPanel>
+                        </Grid>
+                    </Grid>
+                </Grid>
+            </DataTemplate>
+        </ListView.ItemTemplate>
+    </ListView>
+</Grid>
\ No newline at end of file
diff --git a/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml.cs b/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml.cs
index ae9d23c..f821b5b 100644
--- a/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml.cs
+++ b/Qwilight/View/MainWindow/DefaultMode/EntryView.xaml.cs
@@ -4,6 +4,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Threading;
 
 namespace Qwilight.View
 {
diff --git a/Qwilight/ViewModel/MainViewModel.cs b/Qwilight/ViewModel/MainViewModel.cs
index 265b50a..e374059 100644
--- a/Qwilight/ViewModel/MainViewModel.cs
+++ b/Qwilight/ViewModel/MainViewModel.cs
@@ -93,7 +93,6 @@
         int? _lastLowerMillis;
         bool _wasLowerMillis = true;
         bool _isUILoading;
-        bool _isDefaultEntryLoading;
         bool _isInputWantPointed;
         bool _isTwilightCommentaryPointed;
         bool _isDefaultCommentLoading;
@@ -480,18 +479,7 @@
             }
         }
 
-        public bool IsDefaultEntryLoading
-        {
-            get => _isDefaultEntryLoading;
-
-            set
-            {
-                if (SetProperty(ref _isDefaultEntryLoading, value, nameof(IsDefaultEntryLoading)) && !value)
-                {
-                    PointEntryView();
-                }
-            }
-        }
+        public bool IsDefaultEntryLoading { get; set; }
 
         public bool IsUILoading
         {
@@ -829,7 +817,6 @@
                                 DefaultEntryVarietyValue = DefaultEntryItem.DefaultEntryVariety.Default,
                                 DefaultEntryPath = filePath
                             };
-                            UIHandler.Instance.HandleParallel(() => ViewModels.Instance.ModifyDefaultEntryValue.DefaultEntryItemCollection.Add(defaultEntryItem));
                             if (!Configure.Instance.DefaultEntryItems.Contains(defaultEntryItem))
                             {
                                 Configure.Instance.DefaultEntryItems.Add(defaultEntryItem);
@@ -852,14 +839,8 @@
                     }
                     if (lastDefaultEntryItem != null)
                     {
-                        UIHandler.Instance.HandleParallel(() =>
-                        {
-                            if (!IsDefaultEntryLoading)
-                            {
-                                Configure.Instance.LastDefaultEntryItem = lastDefaultEntryItem;
-                                SetDefaultEntryItems();
-                            }
-                        });
+                        Configure.Instance.LastDefaultEntryItem = lastDefaultEntryItem;
+                        SetDefaultEntryItems();
                     }
                 });
             }
@@ -1029,6 +1010,7 @@
             switch (e.Key)
             {
                 case Key.System when e.SystemKey != Key.F4:
+                case Key.Back:
                 case Key.Escape:
                 case Key.Space:
                     e.Handled = true;
@@ -2162,7 +2144,7 @@
         public void Want(EntryItem wantEntryItem = null)
         {
             _wantHandler.Stop();
-            if (IsNoteFileMode && !IsDefaultEntryLoading)
+            if (IsNoteFileMode)
             {
                 UIHandler.Instance.HandleParallel(() =>
                 {
diff --git a/Qwilight/sdk/tools/ContentBuilder/scripts/simple_app_build.vdf b/Qwilight/sdk/tools/ContentBuilder/scripts/simple_app_build.vdf
deleted file mode 100644
index eef3ffc..0000000
--- a/Qwilight/sdk/tools/ContentBuilder/scripts/simple_app_build.vdf
+++ /dev/null
@@ -1,21 +0,0 @@
-"AppBuild"
-{
-	"AppID" "1910130" // your AppID
-	"Desc" "This is a simple build script" // internal description for this build
- 
-	"ContentRoot" "..\..\..\..\bin\x64\Release\net8.0-windows10.0.22621.0\win-x64\publish\" // root content folder, relative to location of this file
-	"BuildOutput" "..\output\" // build output folder for build logs and build cache files
- 
-	"Depots"
-	{
-		"1910131" // your DepotID
-		{
-			"FileMapping"
-			{
-				"LocalPath" "*" // all files from contentroot folder
-				"DepotPath" "." // mapped into the root of the depot
-				"recursive" "1" // include all subfolders
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/sdk/tools/ContentBuilder/scripts/simple_app_build.vdf b/sdk/tools/ContentBuilder/scripts/simple_app_build.vdf
new file mode 100644
index 0000000..a102164
--- /dev/null
+++ b/sdk/tools/ContentBuilder/scripts/simple_app_build.vdf
@@ -0,0 +1,21 @@
+"AppBuild"
+{
+	"AppID" "1910130" // your AppID
+	"Desc" "This is a simple build script" // internal description for this build
+ 
+	"ContentRoot" "..\..\..\..\Qwilight\bin\x64\Release\net8.0-windows10.0.22621.0\win-x64\publish\" // root content folder, relative to location of this file
+	"BuildOutput" "..\output\" // build output folder for build logs and build cache files
+ 
+	"Depots"
+	{
+		"1910131" // your DepotID
+		{
+			"FileMapping"
+			{
+				"LocalPath" "*" // all files from contentroot folder
+				"DepotPath" "." // mapped into the root of the depot
+				"recursive" "1" // include all subfolders
+			}
+		}
+	}
+}
\ No newline at end of file