diff --git a/src/Starward/Pages/MainPage.xaml b/src/Starward/Pages/MainPage.xaml
index eb7b81714..8c40b79ab 100644
--- a/src/Starward/Pages/MainPage.xaml
+++ b/src/Starward/Pages/MainPage.xaml
@@ -69,13 +69,13 @@
                         <FontIcon Glyph="&#xE80F;" />
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
-                <NavigationViewItem Name="NavigationViewItem_GameAnnounce"
+                <!--<NavigationViewItem Name="NavigationViewItem_GameAnnounce"
                                     Content="{x:Bind lang:Lang.MainPage_GameNotices}"
                                     Tag="GameNoticesPage">
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE789;" />
                     </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                </NavigationViewItem>-->
                 <NavigationViewItem Name="NavigationViewItem_GameSetting"
                                     Content="{x:Bind lang:Lang.LauncherPage_GameSetting}"
                                     Tag="GameSettingPage">
@@ -355,7 +355,7 @@
                     </StackPanel>
                 </Button>
                 <!--  2  -->
-                <Button x:Name="Button_Navigation_2"
+                <!--<Button x:Name="Button_Navigation_2"
                         Height="40"
                         Click="Button_Navigation_Click"
                         Style="{ThemeResource DateTimePickerFlyoutButtonStyle}"
@@ -369,13 +369,13 @@
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                    Text="2" />
                     </StackPanel>
-                </Button>
+                </Button>-->
                 <!--  3  -->
                 <Button x:Name="Button_Navigation_3"
                         Height="40"
                         Click="Button_Navigation_Click"
                         Style="{ThemeResource DateTimePickerFlyoutButtonStyle}"
-                        Tag="3">
+                        Tag="2">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <FontIcon FontSize="16"
                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
@@ -383,7 +383,7 @@
                         <TextBlock HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                   Text="3" />
+                                   Text="2" />
                     </StackPanel>
                 </Button>
                 <!--  4  -->
@@ -391,7 +391,7 @@
                         Height="40"
                         Click="Button_Navigation_Click"
                         Style="{ThemeResource DateTimePickerFlyoutButtonStyle}"
-                        Tag="4">
+                        Tag="3">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <FontIcon FontSize="16"
                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
@@ -399,7 +399,7 @@
                         <TextBlock HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                   Text="4" />
+                                   Text="3" />
                     </StackPanel>
                 </Button>
                 <!--  5  -->
@@ -408,7 +408,7 @@
                         x:Load="{x:Bind NavigationViewItem_GachaLog.Visibility, Converter={StaticResource VisibilityToBoolConverter}}"
                         Click="Button_Navigation_Click"
                         Style="{ThemeResource DateTimePickerFlyoutButtonStyle}"
-                        Tag="5">
+                        Tag="4">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <FontIcon x:Name="FontIcon_5"
                                   FontSize="16"
@@ -418,7 +418,7 @@
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                   Text="5" />
+                                   Text="4" />
                     </StackPanel>
                 </Button>
                 <!--  6  -->
@@ -427,7 +427,7 @@
                         x:Load="{x:Bind NavigationViewItem_HoyolabToolbox.Visibility, Converter={StaticResource VisibilityToBoolConverter}}"
                         Click="Button_Navigation_Click"
                         Style="{ThemeResource DateTimePickerFlyoutButtonStyle}"
-                        Tag="6">
+                        Tag="5">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <FontIcon x:Name="FontIcon_6"
                                   FontSize="16"
@@ -437,7 +437,7 @@
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                   Text="6" />
+                                   Text="5" />
                     </StackPanel>
                 </Button>
                 <!--  7  -->
@@ -446,7 +446,7 @@
                         x:Load="{x:Bind NavigationViewItem_SelfQuery.Visibility, Converter={StaticResource VisibilityToBoolConverter}}"
                         Click="Button_Navigation_Click"
                         Style="{ThemeResource DateTimePickerFlyoutButtonStyle}"
-                        Tag="7">
+                        Tag="6">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <FontIcon x:Name="FontIcon_7"
                                   FontSize="16"
@@ -456,7 +456,7 @@
                                    HorizontalAlignment="Center"
                                    VerticalAlignment="Center"
                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                   Text="7" />
+                                   Text="6" />
                     </StackPanel>
                 </Button>
             </StackPanel>
diff --git a/src/Starward/Pages/MainPage.xaml.cs b/src/Starward/Pages/MainPage.xaml.cs
index 64be9617a..8f1488d3a 100644
--- a/src/Starward/Pages/MainPage.xaml.cs
+++ b/src/Starward/Pages/MainPage.xaml.cs
@@ -968,32 +968,32 @@ private void ShortcutNavigate(int num)
             NavigationViewItem_Launcher.IsSelected = true;
             NavigateTo(typeof(LauncherPage));
         }
+        //if (num == 2)
+        //{
+        //    NavigationViewItem_GameAnnounce.IsSelected = true;
+        //    NavigateTo(typeof(GameNoticesPage));
+        //}
         if (num == 2)
-        {
-            NavigationViewItem_GameAnnounce.IsSelected = true;
-            NavigateTo(typeof(GameNoticesPage));
-        }
-        if (num == 3)
         {
             NavigationViewItem_GameSetting.IsSelected = true;
             NavigateTo(typeof(GameSettingPage));
         }
-        if (num == 4)
+        if (num == 3)
         {
             NavigationViewItem_Screenshot.IsSelected = true;
             NavigateTo(typeof(ScreenshotPage));
         }
-        if (num == 5 && CurrentGameBiz.ToGame() != GameBiz.Honkai3rd)
+        if (num == 4 && CurrentGameBiz.ToGame() != GameBiz.Honkai3rd)
         {
             NavigationViewItem_GachaLog.IsSelected = true;
             NavigateTo(typeof(GachaLogPage));
         }
-        if (num == 6 && CurrentGameBiz.ToGame() != GameBiz.Honkai3rd)
+        if (num == 5 && CurrentGameBiz.ToGame() != GameBiz.Honkai3rd)
         {
             NavigationViewItem_HoyolabToolbox.IsSelected = true;
             NavigateTo(typeof(HoyolabToolboxPage));
         }
-        if (num == 7 && CurrentGameBiz.ToGame() != GameBiz.Honkai3rd)
+        if (num == 6 && CurrentGameBiz.ToGame() != GameBiz.Honkai3rd)
         {
             NavigationViewItem_SelfQuery.IsSelected = true;
             NavigateTo(typeof(SelfQueryPage));