diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ae1001f..587edcb0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Serein.Pro_win-x64
-          path: ./src/Serein.Pro/bin/Debug/net8.0-windows10.0.19041.0/win-x64
+          path: ./src/Serein.Pro/bin/Debug/net8.0-windows10.0.19041/win-x64
 
       # Serein.Cli
       - name: Upload binary files(Serein.Cli_win-x64)
diff --git a/src/Serein.Pro/App.xaml.cs b/src/Serein.Pro/App.xaml.cs
index 0025ff92..db99d0e1 100644
--- a/src/Serein.Pro/App.xaml.cs
+++ b/src/Serein.Pro/App.xaml.cs
@@ -44,6 +44,7 @@ private static SereinApp Build()
 
         builder.Services.AddTransient<ShellViewModel>();
         builder.Services.AddTransient<SettingViewModel>();
+        builder.Services.AddTransient<AboutViewModel>();
 
         builder.Services.AddSingleton<ILogger, NotificationLogger>();
         builder.Services.AddSingleton<IPluginLogger, PluginLogger>();
diff --git a/src/Serein.Pro/MainWindow.xaml b/src/Serein.Pro/MainWindow.xaml
index facbc66b..8bde361d 100644
--- a/src/Serein.Pro/MainWindow.xaml
+++ b/src/Serein.Pro/MainWindow.xaml
@@ -17,24 +17,35 @@
         <MicaBackdrop Kind="Base" />
     </Window.SystemBackdrop>
 
-    <Grid>
-        <Frame x:Name="RootFrame" />
-        <InfoBar
-            x:Name="GlobalInfoBar"
-            MaxWidth="500"
-            Margin="0,20"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Bottom"
-            CloseButtonClick="GlobalInfoBar_CloseButtonClick">
-            <InfoBar.Resources>
-                <Storyboard x:Name="GlobalInfoBarPopIn">
-                    <PopInThemeAnimation TargetName="GlobalInfoBar" />
-                </Storyboard>
-                <Storyboard x:Name="GlobalInfoBarPopOut">
-                    <PopOutThemeAnimation TargetName="GlobalInfoBar" />
-                </Storyboard>
-            </InfoBar.Resources>
-        </InfoBar>
-    </Grid>
-
+    <Border
+        x:Name="DragBorder"
+        Padding="0"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch"
+        AllowDrop="True"
+        BorderBrush="Transparent"
+        BorderThickness="2"
+        DragEnter="DragBorder_DragEnter"
+        DragLeave="DragBorder_DragLeave"
+        DragOver="DragBorder_DragOver">
+        <Grid>
+            <Frame x:Name="RootFrame" />
+            <InfoBar
+                x:Name="GlobalInfoBar"
+                MaxWidth="500"
+                Margin="0,20"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Bottom"
+                CloseButtonClick="GlobalInfoBar_CloseButtonClick">
+                <InfoBar.Resources>
+                    <Storyboard x:Name="GlobalInfoBarPopIn">
+                        <PopInThemeAnimation TargetName="GlobalInfoBar" />
+                    </Storyboard>
+                    <Storyboard x:Name="GlobalInfoBarPopOut">
+                        <PopOutThemeAnimation TargetName="GlobalInfoBar" />
+                    </Storyboard>
+                </InfoBar.Resources>
+            </InfoBar>
+        </Grid>
+    </Border>
 </windowex:WindowEx>
diff --git a/src/Serein.Pro/MainWindow.xaml.cs b/src/Serein.Pro/MainWindow.xaml.cs
index 3cce46b3..6d3cc57b 100644
--- a/src/Serein.Pro/MainWindow.xaml.cs
+++ b/src/Serein.Pro/MainWindow.xaml.cs
@@ -3,12 +3,17 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+using Microsoft.UI;
 using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
 
 using Serein.Pro.Models;
 using Serein.Pro.Views;
 
+using Windows.ApplicationModel.DataTransfer;
+
 using WinUIEx;
 
 namespace Serein.Pro;
@@ -16,7 +21,7 @@ namespace Serein.Pro;
 public sealed partial class MainWindow : WindowEx
 {
     private readonly DispatcherQueue _dispatcherQueue;
-    private CancellationTokenSource ?_cancellationTokenSource;
+    private CancellationTokenSource? _cancellationTokenSource;
 
     public MainWindow(ShellPage shellPage)
     {
@@ -39,7 +44,7 @@ public void ShowInfoBar(InfoBarTask infoBarTask)
             GlobalInfoBar.IsOpen = true;
 
             _cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(infoBarTask.CancellationToken);
-            
+
             GlobalInfoBarPopIn.Completed += Wait;
             GlobalInfoBarPopIn.Begin();
 
@@ -74,4 +79,23 @@ private void GlobalInfoBar_CloseButtonClick(InfoBar sender, object args)
         if (_cancellationTokenSource?.IsCancellationRequested is false)
             _cancellationTokenSource.Cancel();
     }
+
+    private void DragBorder_DragOver(object sender, DragEventArgs e)
+    {
+        if (e.DataView.Contains(StandardDataFormats.StorageItems))
+        {
+            e.AcceptedOperation = DataPackageOperation.Copy;
+            DragBorder.BorderBrush = new SolidColorBrush(Colors.Goldenrod);
+        }
+    }
+
+    private void DragBorder_DragLeave(object sender, DragEventArgs e)
+    {
+        DragBorder.BorderBrush = new SolidColorBrush(Colors.Transparent);
+    }
+
+    private void DragBorder_DragEnter(object sender, DragEventArgs e)
+    {
+
+    }
 }
diff --git a/src/Serein.Pro/Serein.Pro.csproj b/src/Serein.Pro/Serein.Pro.csproj
index 0d4bf0d8..319348f1 100644
--- a/src/Serein.Pro/Serein.Pro.csproj
+++ b/src/Serein.Pro/Serein.Pro.csproj
@@ -17,6 +17,7 @@
     <None Remove="Views\BugSolvingPage.xaml" />
     <None Remove="Views\MatchPage.xaml" />
     <None Remove="Views\ServerPage.xaml" />
+    <None Remove="Views\Settings\AboutPage.xaml" />
     <None Remove="Views\Settings\ConnectionSettingPage.xaml" />
     <None Remove="Views\Settings\SettingPage.xaml" />
   </ItemGroup>
@@ -33,6 +34,12 @@
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Update="Views\Settings\AboutPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
   <ItemGroup>
     <Page Update="Views\BugSolvingPage.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Serein.Pro/ViewModels/AboutViewModel.cs b/src/Serein.Pro/ViewModels/AboutViewModel.cs
new file mode 100644
index 00000000..44572582
--- /dev/null
+++ b/src/Serein.Pro/ViewModels/AboutViewModel.cs
@@ -0,0 +1,13 @@
+using Serein.Core;
+
+namespace Serein.Pro.ViewModels;
+public class AboutViewModel
+{
+    public string Version { get; } = SereinApp.Version;
+
+    public string DetailedVersion { get; } = SereinApp.FullVersion ?? "未知";
+
+    public string AssemblyName { get; } = typeof(AboutViewModel).Assembly.ToString();
+
+    public string AssemblyPath { get; } = typeof(AboutViewModel).Assembly.Location;
+}
diff --git a/src/Serein.Pro/ViewModels/SettingViewModel.cs b/src/Serein.Pro/ViewModels/SettingViewModel.cs
index fc14acbc..d7b6cebd 100644
--- a/src/Serein.Pro/ViewModels/SettingViewModel.cs
+++ b/src/Serein.Pro/ViewModels/SettingViewModel.cs
@@ -7,4 +7,6 @@ namespace Serein.Pro.ViewModels;
 public class SettingViewModel
 {
     public Type Connection { get; } = typeof(ConnectionSettingPage);
+
+    public Type About { get; } = typeof(AboutPage);
 }
diff --git a/src/Serein.Pro/Views/BugSolvingPage.xaml b/src/Serein.Pro/Views/BugSolvingPage.xaml
index 004eb59d..ccb65984 100644
--- a/src/Serein.Pro/Views/BugSolvingPage.xaml
+++ b/src/Serein.Pro/Views/BugSolvingPage.xaml
@@ -10,7 +10,7 @@
 
     <!--
         To solve a crush caused by using Microsoft.UI.Xaml.Controls.SelectorBar
-        solution: https://github.com/microsoft/microsoft-ui-xaml/issues/9424#issuecomment-2035733908
+        solution: https://github.com/microsoft/microsoft-ui-xaml/issues/9424#issuecomment-2035668868
     -->
     <ItemsRepeater />
 </Page>
diff --git a/src/Serein.Pro/Views/HomePage.xaml b/src/Serein.Pro/Views/HomePage.xaml
index 7889fcbc..6d31b32f 100644
--- a/src/Serein.Pro/Views/HomePage.xaml
+++ b/src/Serein.Pro/Views/HomePage.xaml
@@ -6,7 +6,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Serein.Pro.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
 
     <Grid />
diff --git a/src/Serein.Pro/Views/MatchPage.xaml b/src/Serein.Pro/Views/MatchPage.xaml
index bd1e59cc..48106f93 100644
--- a/src/Serein.Pro/Views/MatchPage.xaml
+++ b/src/Serein.Pro/Views/MatchPage.xaml
@@ -11,7 +11,42 @@
     mc:Ignorable="d">
 
     <Grid>
-        <controls:DataGrid AutoGenerateColumns="False" ItemsSource="{x:Bind MatchesProvider.Value}">
+        <controls:DataGrid
+            VerticalAlignment="Stretch"
+            AutoGenerateColumns="False"
+            ItemsSource="{x:Bind MatchesProvider.Value}">
+            <controls:DataGrid.ContextFlyout>
+                <MenuBarItemFlyout Opening="MenuBarItemFlyout_Opening">
+                    <MenuFlyoutItem
+                        Click="MenuFlyoutItem_Click"
+                        Icon="Add"
+                        Tag="Add"
+                        Text="添加..." />
+                    <MenuFlyoutItem
+                        x:Name="EditMenuFlyoutItem"
+                        Click="MenuFlyoutItem_Click"
+                        Icon="Edit"
+                        Tag="Edit"
+                        Text="编辑..." />
+                    <MenuFlyoutItem
+                        x:Name="RemoveMenuFlyoutItem"
+                        Click="MenuFlyoutItem_Click"
+                        Icon="Delete"
+                        Tag="Remove"
+                        Text="删除" />
+                    <MenuFlyoutItem
+                        Click="MenuFlyoutItem_Click"
+                        Icon="Refresh"
+                        Tag="Refresh"
+                        Text="刷新" />
+                    <MenuFlyoutSeparator />
+                    <MenuFlyoutItem
+                        Click="MenuFlyoutItem_Click"
+                        Icon="Globe"
+                        Tag="OpenDoc"
+                        Text="打开介绍文档" />
+                </MenuBarItemFlyout>
+            </controls:DataGrid.ContextFlyout>
             <controls:DataGrid.Columns>
                 <controls:DataGridTextColumn Binding="{Binding RegExp, UpdateSourceTrigger=PropertyChanged}" Header="正则表达式" />
                 <controls:DataGridTemplateColumn CanUserSort="True" Header="匹配域">
@@ -43,5 +78,12 @@
                 <controls:DataGridTextColumn Binding="{Binding Exclusions}" Header="排除" />
             </controls:DataGrid.Columns>
         </controls:DataGrid>
+        <StackPanel
+            HorizontalAlignment="Right"
+            VerticalAlignment="Bottom"
+            Orientation="Horizontal">
+            <Button Content="↑" />
+            <Button Margin="5" Content="↓" />
+        </StackPanel>
     </Grid>
 </Page>
\ No newline at end of file
diff --git a/src/Serein.Pro/Views/MatchPage.xaml.cs b/src/Serein.Pro/Views/MatchPage.xaml.cs
index 1a014daf..120bcd32 100644
--- a/src/Serein.Pro/Views/MatchPage.xaml.cs
+++ b/src/Serein.Pro/Views/MatchPage.xaml.cs
@@ -21,4 +21,14 @@ public MatchPage()
 
         InitializeComponent();
     }
+
+    private void MenuFlyoutItem_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+
+    }
+
+    private void MenuBarItemFlyout_Opening(object sender, object e)
+    {
+
+    }
 }
diff --git a/src/Serein.Pro/Views/ServerPage.xaml b/src/Serein.Pro/Views/ServerPage.xaml
index 10a35381..53949226 100644
--- a/src/Serein.Pro/Views/ServerPage.xaml
+++ b/src/Serein.Pro/Views/ServerPage.xaml
@@ -11,6 +11,13 @@
     Unloaded="Page_Unloaded"
     mc:Ignorable="d">
 
+    <Page.Resources>
+        <MenuFlyout x:Name="TabViewMenuFlyout">
+            <MenuFlyoutItem Icon="Add" Text="添加" />
+            <MenuFlyoutItem Icon="Import" Text="导入" />
+        </MenuFlyout>
+    </Page.Resources>
+
     <TabView
         x:Name="TabView"
         Margin="0,5"
diff --git a/src/Serein.Pro/Views/ServerPage.xaml.cs b/src/Serein.Pro/Views/ServerPage.xaml.cs
index 0c304969..7855771e 100644
--- a/src/Serein.Pro/Views/ServerPage.xaml.cs
+++ b/src/Serein.Pro/Views/ServerPage.xaml.cs
@@ -22,6 +22,7 @@ public sealed partial class ServerPage : Page
     private readonly DispatcherQueue _dispatcherQueue;
     private readonly InfoBarProvider _infoBarProvider;
     private readonly MenuBarItemFlyout _tabMenuBarItem;
+    private readonly MainWindow _mainWindow;
     private CancellationTokenSource? _cancellationTokenSource;
 
     public ServerPage()
@@ -29,6 +30,7 @@ public ServerPage()
         _services = SereinApp.Current!.Services;
         _serverManager = _services.GetRequiredService<ServerManager>();
         _infoBarProvider = _services.GetRequiredService<InfoBarProvider>();
+        _mainWindow = _services.GetRequiredService<MainWindow>();
         _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
 
         var item1 = new MenuFlyoutItem
@@ -135,7 +137,7 @@ private void MenuFlyoutItem_Click(object sender, RoutedEventArgs e)
 
     private void TabView_AddTabButtonClick(TabView sender, object args)
     {
-
+        TabViewMenuFlyout.ShowAt(sender);
     }
 
     private void Page_Unloaded(object sender, RoutedEventArgs e)
diff --git a/src/Serein.Pro/Views/Settings/AboutPage.xaml b/src/Serein.Pro/Views/Settings/AboutPage.xaml
new file mode 100644
index 00000000..310514da
--- /dev/null
+++ b/src/Serein.Pro/Views/Settings/AboutPage.xaml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Page
+    x:Class="Serein.Pro.Views.Settings.AboutPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Serein.Pro.Views.Settings"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    NavigationCacheMode="Disabled"
+    mc:Ignorable="d">
+
+    <ScrollViewer>
+        <StackPanel Margin="20">
+            <controls:SettingsExpander
+                Description="Copyright © 2022 Zaitonn. All Rights Reserved."
+                Header="Serein.Pro"
+                IsExpanded="True">
+                <controls:SettingsExpander.HeaderIcon>
+                    <BitmapIcon ShowAsMonochrome="False" UriSource="/Assets/logo.ico" />
+                </controls:SettingsExpander.HeaderIcon>
+
+                <controls:SettingsExpander.Items>
+                    <controls:SettingsCard Header="分发许可证">
+                        <HyperlinkButton NavigateUri="https://github.com/SereinDev/Serein?tab=GPL-3.0-1-ov-file#">
+                            GPL-3.0 license
+                        </HyperlinkButton>
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard Header="版本号">
+                        <TextBlock
+                            FontSize="12"
+                            IsTextSelectionEnabled="True"
+                            Text="{x:Bind ViewModel.Version}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard Header="详细版本">
+                        <TextBlock
+                            FontSize="12"
+                            IsTextSelectionEnabled="True"
+                            Text="{x:Bind ViewModel.DetailedVersion}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard Header="程序集">
+                        <TextBlock
+                            FontSize="12"
+                            IsTextSelectionEnabled="True"
+                            Text="{x:Bind ViewModel.AssemblyName}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard Header="路径">
+                        <TextBlock
+                            FontSize="12"
+                            IsTextSelectionEnabled="True"
+                            Text="{x:Bind ViewModel.AssemblyPath}" />
+                    </controls:SettingsCard>
+
+
+                    <controls:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
+                        <StackPanel Orientation="Horizontal">
+                            <StackPanel.Resources>
+                                <Style BasedOn="{StaticResource DefaultHyperlinkButtonStyle}" TargetType="HyperlinkButton">
+                                    <Setter Property="Margin" Value="3" />
+                                </Style>
+                            </StackPanel.Resources>
+                            <HyperlinkButton Content="Github仓库" NavigateUri="https://github.com/SereinDev/Serein" />
+                            <HyperlinkButton Content="官网/文档" NavigateUri="https://sereindev.github.io/" />
+                            <HyperlinkButton Content="交流群" NavigateUri="https://jq.qq.com/?_wv=1027&amp;k=XNZqPSPv" />
+                        </StackPanel>
+                    </controls:SettingsCard>
+                </controls:SettingsExpander.Items>
+            </controls:SettingsExpander>
+
+            <TextBlock
+                Margin="0,10"
+                Style="{StaticResource SubtitleTextBlockStyle}"
+                Text="免责声明" />
+            <TextBlock IsTextSelectionEnabled="True" TextWrapping="WrapWholeWords">
+                本程序不涉及分发、修改和传播Minecraft客户端及服务端，仅作为服务端的管理软件方便服务器管理员（软件用户）控制服务器，一切行为导致的后果或纠纷由用户自行承担。<LineBreak />
+                <LineBreak />
+                · “Minecraft”是 Mojang Synergies AB 的商标<LineBreak />
+                · 此软件与Mojang Studio、网易、Microsoft没有从属关系<LineBreak />
+                · 使用本程序启动任何Minecraft服务端即代表您已阅读并同意了<Hyperlink NavigateUri="https://www.minecraft.net/zh-hans/eula">
+                    MINECRAFT 最终用户许可协议
+                </Hyperlink>
+                和<Hyperlink NavigateUri="https://account.mojang.com/documents/commercial_guidelines">
+                    MINECRAFT 商业使用准则
+                </Hyperlink>
+            </TextBlock>
+
+        </StackPanel>
+    </ScrollViewer>
+</Page>
diff --git a/src/Serein.Pro/Views/Settings/AboutPage.xaml.cs b/src/Serein.Pro/Views/Settings/AboutPage.xaml.cs
new file mode 100644
index 00000000..8bc154c0
--- /dev/null
+++ b/src/Serein.Pro/Views/Settings/AboutPage.xaml.cs
@@ -0,0 +1,23 @@
+using System;
+
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml.Controls;
+
+using Serein.Core;
+using Serein.Pro.ViewModels;
+
+namespace Serein.Pro.Views.Settings;
+
+public sealed partial class AboutPage : Page
+{
+    private readonly IServiceProvider _services;
+    public AboutViewModel ViewModel { get; }
+
+    public AboutPage()
+    {
+        _services = SereinApp.Current!.Services;
+        ViewModel = _services.GetRequiredService<AboutViewModel>();
+
+        InitializeComponent();
+    }
+}
diff --git a/src/Serein.Pro/Views/Settings/SettingPage.xaml b/src/Serein.Pro/Views/Settings/SettingPage.xaml
index 4b402cf0..ed0d9f20 100644
--- a/src/Serein.Pro/Views/Settings/SettingPage.xaml
+++ b/src/Serein.Pro/Views/Settings/SettingPage.xaml
@@ -6,32 +6,22 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Serein.Pro.Views.Settings"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    NavigationCacheMode="Enabled"
     mc:Ignorable="d">
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="auto" />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-
-        <Border BorderBrush="{StaticResource ControlStrokeColorDefaultBrush}" BorderThickness="0,0,0,1">
-            <SelectorBar x:Name="SelectorBar" SelectionChanged="SelectorBar_SelectionChanged">
-                <SelectorBarItem
-                    IsSelected="True"
-                    Tag="{x:Bind ViewModel.Connection}"
-                    Text="连接" />
-                <SelectorBarItem Text="应用" />
-                <SelectorBarItem Text="反应" />
-                <SelectorBarItem Text="SSH" />
-                <SelectorBarItem Text="Web Api" />
-                <SelectorBarItem Text="关于" />
-            </SelectorBar>
-        </Border>
-
-        <Frame
-            x:Name="ContentFrame"
-            Grid.Row="1"
-            IsNavigationStackEnabled="False" />
-    </Grid>
+    <NavigationView
+        x:Name="NavView"
+        IsBackButtonVisible="Collapsed"
+        IsSettingsVisible="False"
+        ItemInvoked="NavView_ItemInvoked"
+        PaneDisplayMode="Top">
+        <NavigationView.MenuItems>
+            <NavigationViewItem Content="连接" Tag="{x:Bind ViewModel.Connection}" />
+            <NavigationViewItem Content="应用" />
+            <NavigationViewItem Content="反应" />
+            <NavigationViewItem Content="SSH" />
+            <NavigationViewItem Content="Web Api" />
+            <NavigationViewItem Content="关于" Tag="{x:Bind ViewModel.About}" />
+        </NavigationView.MenuItems>
+        <Frame x:Name="ContentFrame" IsNavigationStackEnabled="False" />
+    </NavigationView>
 </Page>
diff --git a/src/Serein.Pro/Views/Settings/SettingPage.xaml.cs b/src/Serein.Pro/Views/Settings/SettingPage.xaml.cs
index ab5edf69..f7695a6c 100644
--- a/src/Serein.Pro/Views/Settings/SettingPage.xaml.cs
+++ b/src/Serein.Pro/Views/Settings/SettingPage.xaml.cs
@@ -1,8 +1,8 @@
 using System;
+using System.Linq;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media.Animation;
 
 using Serein.Core;
 using Serein.Pro.ViewModels;
@@ -11,6 +11,7 @@ namespace Serein.Pro.Views.Settings;
 
 public sealed partial class SettingPage : Page
 {
+    private Type? _currentPage;
     private readonly IServiceProvider _services;
     private SettingViewModel ViewModel { get; }
 
@@ -20,12 +21,22 @@ public SettingPage()
         ViewModel = _services.GetRequiredService<SettingViewModel>();
 
         InitializeComponent();
+
+        NavView.SelectedItem =
+            NavView.MenuItems.OfType<NavigationViewItem>().FirstOrDefault((item) => item.Tag as Type == _currentPage) ??
+            NavView.MenuItems[0];
+        ContentFrame.Navigate(_currentPage ?? ViewModel.Connection);
     }
 
-    private void SelectorBar_SelectionChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs args)
+    private void NavView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args)
     {
-        if (SelectorBar.SelectedItem.Tag is not Type type)
+        if (args.InvokedItemContainer is not NavigationViewItem { Tag: Type type })
             type = typeof(BlankPage);
-        ContentFrame.Navigate(type,null ,new DrillInNavigationTransitionInfo());
+
+        if (ContentFrame.CurrentSourcePageType != type)
+        {
+            ContentFrame.Navigate(type, null, args.RecommendedNavigationTransitionInfo);
+            _currentPage = type;
+        }
     }
 }
diff --git a/src/Serein.Pro/Views/ShellPage.xaml b/src/Serein.Pro/Views/ShellPage.xaml
index ea0a23c0..2ee08332 100644
--- a/src/Serein.Pro/Views/ShellPage.xaml
+++ b/src/Serein.Pro/Views/ShellPage.xaml
@@ -31,11 +31,13 @@
         </Grid>
         <NavigationView
             x:Name="NavView"
+            BackRequested="NavView_BackRequested"
             Canvas.ZIndex="0"
             DisplayModeChanged="NavView_DisplayModeChanged"
             ExpandedModeThresholdWidth="1280"
             IsBackButtonVisible="Visible"
             IsSettingsVisible="True"
+            IsTitleBarAutoPaddingEnabled="True"
             ItemInvoked="NavView_ItemInvoked">
             <NavigationView.MenuItems>
                 <NavigationViewItem
diff --git a/src/Serein.Pro/Views/ShellPage.xaml.cs b/src/Serein.Pro/Views/ShellPage.xaml.cs
index 08bb5ad9..54f45c15 100644
--- a/src/Serein.Pro/Views/ShellPage.xaml.cs
+++ b/src/Serein.Pro/Views/ShellPage.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Dispatching;
@@ -33,11 +34,9 @@ public ShellPage()
 
         ViewModel = SereinApp.Current!.Services.GetRequiredService<ShellViewModel>();
 
-        if (NavView.MenuItems.Count > 0 && NavView.MenuItems[0] is NavigationViewItem { Tag: Type type })
-        {
-            NavView.SelectedItem = NavView.MenuItems[0];
-            ContentFrame.Navigate(type);
-        }
+        NavView.SelectedItem = NavView.MenuItems[0];
+        ContentFrame.Navigate(typeof(HomePage));
+        ContentFrame.BackStack.Clear();
     }
 
     private void NavView_DisplayModeChanged(
@@ -62,7 +61,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)
         TitleBarHelper.UpdateTitleBar(RequestedTheme);
     }
 
-
     private void Settings_ColorValuesChanged(UISettings sender, object args)
     {
         _dispatcherQueue.TryEnqueue(() => TitleBarHelper.UpdateTitleBar(AppTitleBar.ActualTheme));
@@ -70,11 +68,33 @@ private void Settings_ColorValuesChanged(UISettings sender, object args)
 
     private void NavView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args)
     {
-        if (args.IsSettingsInvoked)
-            ContentFrame.Navigate(typeof(SettingPage), null, args.RecommendedNavigationTransitionInfo);
-        else if (args.InvokedItemContainer is NavigationViewItem { Tag: Type type })
+        if (args.InvokedItemContainer is not NavigationViewItem { Tag: Type type })
+            type = args.IsSettingsInvoked ? typeof(SettingPage) : typeof(BlankPage);
+
+        if (ContentFrame.CurrentSourcePageType != type)
             ContentFrame.Navigate(type, null, args.RecommendedNavigationTransitionInfo);
-        else
-            ContentFrame.Navigate(typeof(BlankPage), null, args.RecommendedNavigationTransitionInfo);
+
+        NavView.IsBackEnabled = ContentFrame.CanGoBack;
+    }
+
+    private void NavView_BackRequested(
+        NavigationView sender,
+        NavigationViewBackRequestedEventArgs args
+    )
+    {
+        NavView.IsBackEnabled = ContentFrame.CanGoBack;
+
+        if (ContentFrame.CanGoBack)
+        {
+            ContentFrame.GoBack();
+            NavView.SelectedItem =
+                ContentFrame.CurrentSourcePageType == typeof(SettingPage)
+                    ? NavView.SettingsItem
+                    : NavView
+                        .MenuItems.OfType<NavigationViewItem>()
+                        .FirstOrDefault(
+                            (item) => item.Tag as Type == ContentFrame.CurrentSourcePageType
+                        ) ?? NavView.MenuItems[0];
+        }
     }
 }