diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest
index 30514b4..a6327c8 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest	
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest	
@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.20.0" />
+	  Version="1.0.21.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
index c545c08..ab84ce7 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
@@ -16,6 +16,7 @@ using ShadowViewer.Controls;
 using System;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DesktopModeHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DesktopModeHelper.cs
index ee3ecdc..65a8334 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DesktopModeHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DesktopModeHelper.cs
@@ -73,6 +73,14 @@ namespace BetterLyrics.WinUI3.Helper
             int targetX = _settingsService.DesktopWindowLeft;
             int targetY = _settingsService.DesktopWindowTop;
 
+            if (targetWidth <= 0 || targetHeight <= 0 || targetX < 0 || targetY < 0)
+            {
+                targetWidth = 1200;
+                targetHeight = 600;
+                targetX = 200;
+                targetY = 200;
+            }
+
             // 设置窗口大小和位置
             window.AppWindow.MoveAndResize(
                 new Windows.Graphics.RectInt32(targetX, targetY, targetWidth, targetHeight)
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
index 27d8c94..bc17bb6 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
@@ -26,15 +26,6 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        public static void ExitAllWindows()
-        {
-            while (_activeWindows.Count > 0)
-            {
-                var window = (Window)_activeWindows[0];
-                window.Close();
-            }
-        }
-
         public static T? GetWindowByWindowType<T>()
         {
             foreach (var window in _activeWindows)
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs
index 25c1055..f765226 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs
@@ -49,10 +49,10 @@ namespace BetterLyrics.WinUI3.ViewModels
             IsSongPlaying = _playbackService.IsPlaying;
         }
 
-        private void SystemVolumeHelper_VolumeChanged(int volume)
-        {
-            Volume = volume;
-        }
+        //private void SystemVolumeHelper_VolumeChanged(int volume)
+        //{
+        //    Volume = volume;
+        //}
 
         private void PlaybackService_IsPlayingChanged(object? sender, Events.IsPlayingChangedEventArgs e)
         {
@@ -245,10 +245,10 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
         }
 
-        partial void OnVolumeChanged(int value)
-        {
-            SystemVolumeHelper.SetMasterVolume(value);
-        }
+        //partial void OnVolumeChanged(int value)
+        //{
+        //    SystemVolumeHelper.SetMasterVolume(value);
+        //}
 
         public void Receive(PropertyChangedMessage<TimeSpan> message)
         {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs
index 86a3c6d..a433bd6 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs
@@ -34,7 +34,12 @@ namespace BetterLyrics.WinUI3.ViewModels
         [RelayCommand]
         private static void ExitApp()
         {
-            WindowHelper.ExitAllWindows();
+            LyricsWindow? lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (lyricsWindow != null)
+            {
+                DockModeHelper.Disable(lyricsWindow);
+            }
+            App.Current.Exit();
         }
 
         [RelayCommand]
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
index 82839c0..b847035 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
@@ -193,13 +193,12 @@
                         Spacing="3">
 
                         <!--  Volume  -->
-                        <Button
-                            Click="VolumeButton_Click"
-                            Style="{StaticResource GhostButtonStyle}"
-                            Visibility="Collapsed">
+                        <!--<Button Click="VolumeButton_Click" Style="{StaticResource GhostButtonStyle}">
                             <Grid>
 
-                                <!--  Volumn: 0  -->
+                        -->
+                        <!--  Volumn: 0  -->
+                        <!--
                                 <FontIcon
                                     x:Name="VolumeLevel0"
                                     FontFamily="{StaticResource IconFontFamily}"
@@ -209,7 +208,9 @@
                                     </FontIcon.OpacityTransition>
                                 </FontIcon>
 
-                                <!--  Volumn: 1-32  -->
+                        -->
+                        <!--  Volumn: 1-32  -->
+                        <!--
                                 <FontIcon
                                     x:Name="VolumeLevel1"
                                     FontFamily="{StaticResource IconFontFamily}"
@@ -219,7 +220,9 @@
                                     </FontIcon.OpacityTransition>
                                 </FontIcon>
 
-                                <!--  Volumn: 33-65  -->
+                        -->
+                        <!--  Volumn: 33-65  -->
+                        <!--
                                 <FontIcon
                                     x:Name="VolumeLevel2"
                                     FontFamily="{StaticResource IconFontFamily}"
@@ -229,7 +232,9 @@
                                     </FontIcon.OpacityTransition>
                                 </FontIcon>
 
-                                <!--  Volumn: 66-100  -->
+                        -->
+                        <!--  Volumn: 66-100  -->
+                        <!--
                                 <FontIcon
                                     x:Name="VolumeLevel3"
                                     FontFamily="{StaticResource IconFontFamily}"
@@ -257,7 +262,7 @@
                                     </StackPanel>
                                 </Flyout>
                             </Button.DataContext>
-                        </Button>
+                        </Button>-->
 
                         <!--  Translation  -->
                         <Button
@@ -395,10 +400,10 @@
             IsOpen="{x:Bind ViewModel.IsWelcomeTeachingTipOpen, Mode=OneWay}"
             Target="{x:Bind RootGrid}" />
 
-        <!--<uc:SystemTray />-->
+        <uc:SystemTray />
 
         <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="VolumeState">
+            <!--<VisualStateGroup x:Name="VolumeState">
                 <VisualState x:Name="Volume0">
                     <VisualState.StateTriggers>
                         <ui:CompareStateTrigger
@@ -455,7 +460,7 @@
                         <Setter Target="VolumeLevel3.Opacity" Value="1" />
                     </VisualState.Setters>
                 </VisualState>
-            </VisualStateGroup>
+            </VisualStateGroup>-->
         </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
index ad61c07..90a23fd 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
@@ -116,10 +116,10 @@ namespace BetterLyrics.WinUI3.Views
             await _playbackService.ChangePosition(e.NewValue);
         }
 
-        private void VolumeButton_Click(object sender, RoutedEventArgs e)
-        {
-            VolumeFlyout.ShowAt(BottomRightCommandStackPanel);
-        }
+        //private void VolumeButton_Click(object sender, RoutedEventArgs e)
+        //{
+        //    VolumeFlyout.ShowAt(BottomRightCommandStackPanel);
+        //}
 
         private void BottomCommandFlyoutTrigger_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
index d22f6ce..f0c5086 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
@@ -69,6 +69,14 @@ namespace BetterLyrics.WinUI3.Views
             switch (type!)
             {
                 case AutoStartWindowType.StandardMode:
+                    if (_settingsService.StandardWindowLeft < 0 || _settingsService.StandardWindowTop < 0 ||
+                        _settingsService.StandardWindowWidth <= 0 || _settingsService.StandardWindowHeight <= 0)
+                    {
+                        _settingsService.StandardWindowLeft = 200;
+                        _settingsService.StandardWindowTop = 200;
+                        _settingsService.StandardWindowWidth = 1600;
+                        _settingsService.StandardWindowHeight = 800;
+                    }
                     AppWindow.MoveAndResize(new Windows.Graphics.RectInt32(
                         _settingsService.StandardWindowLeft,
                         _settingsService.StandardWindowTop,