diff --git a/src/Commands/Fetch.cs b/src/Commands/Fetch.cs
index f45495fb..9979ff93 100644
--- a/src/Commands/Fetch.cs
+++ b/src/Commands/Fetch.cs
@@ -45,7 +45,7 @@ namespace SourceGit.Commands {
         private Timer timer = null;
 
         public static void Start(string repo) {
-            if (!Models.Preference.Instance.General.AutoFetchRemotes) return;
+            if (!Models.Preference.Instance.Git.AutoFetchRemotes) return;
 
             // 只自动更新加入管理列表中的仓库（子模块等不自动更新）
             var exists = Models.Preference.Instance.FindRepository(repo);
diff --git a/src/Models/Preference.cs b/src/Models/Preference.cs
index 2919752b..4ba96233 100644
--- a/src/Models/Preference.cs
+++ b/src/Models/Preference.cs
@@ -68,11 +68,6 @@ namespace SourceGit.Models {
             /// </summary>
             public int LastCheckDay { get; set; } = 0;
 
-            /// <summary>
-            ///     启用自动拉取远程变更（每10分钟一次）
-            /// </summary>
-            public bool AutoFetchRemotes { get; set; } = true;
-
             /// <summary>
             ///     是否启用崩溃上报
             /// </summary>
@@ -98,6 +93,11 @@ namespace SourceGit.Models {
             ///     默认克隆路径
             /// </summary>
             public string DefaultCloneDir { get; set; }
+
+            /// <summary>
+            ///     启用自动拉取远程变更（每10分钟一次）
+            /// </summary>
+            public bool AutoFetchRemotes { get; set; } = true;
         }
 
         /// <summary>
diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml
index 5b5e0661..94c819a1 100644
--- a/src/Resources/Locales/en_US.xaml
+++ b/src/Resources/Locales/en_US.xaml
@@ -359,18 +359,17 @@
     <sys:String x:Key="Text.Revert.CommitChanges">Commit revert changes</sys:String>
 
     <sys:String x:Key="Text.Preference">Preference</sys:String>
-    <sys:String x:Key="Text.Preference.General">GENERAL SETTING</sys:String>
+    <sys:String x:Key="Text.Preference.General">GENERAL</sys:String>
     <sys:String x:Key="Text.Preference.Locale">Language</sys:String>
     <sys:String x:Key="Text.Preference.FontFamilyWindow">Window Font</sys:String>
     <sys:String x:Key="Text.Preference.FontFamilyContent">Content Font</sys:String>
     <sys:String x:Key="Text.Preference.AvatarServer">Avatar Server</sys:String>
     <sys:String x:Key="Text.Preference.CheckUpdate">Check for update</sys:String>
     <sys:String x:Key="Text.Preference.UseDarkTheme">Use dark theme</sys:String>
-    <sys:String x:Key="Text.Preference.AutoFetch">Fetch remotes automatically (need restart)</sys:String>
     <sys:String x:Key="Text.Preference.RestoreTabs">Restore windows</sys:String>
     <sys:String x:Key="Text.Preference.EnableCrashReport">Enable crash report (maybe include related path)</sys:String>
     <sys:String x:Key="Text.Preference.UseWindowsTerminal">Use Windows Terminal instead of cmd.exe</sys:String>
-    <sys:String x:Key="Text.Preference.Git">GIT SETTING</sys:String>
+    <sys:String x:Key="Text.Preference.Git">GIT</sys:String>
     <sys:String x:Key="Text.Preference.Git.Path">Install Path</sys:String>
     <sys:String x:Key="Text.Preference.Git.Path.Placeholder">Input path for git.exe</sys:String>
     <sys:String x:Key="Text.Preference.Git.Version">Git version</sys:String>
@@ -381,7 +380,8 @@
     <sys:String x:Key="Text.Preference.Git.Email">User Email</sys:String>
     <sys:String x:Key="Text.Preference.Git.Email.Placeholder">Global git user email</sys:String>
     <sys:String x:Key="Text.Preference.Git.CRLF">Enable Auto CRLF</sys:String>
-    <sys:String x:Key="Text.Preference.Merger">MERGE TOOL</sys:String>
+    <sys:String x:Key="Text.Preference.Git.AutoFetch">Fetch remotes automatically (need restart)</sys:String>
+    <sys:String x:Key="Text.Preference.Merger">MERGE</sys:String>
     <sys:String x:Key="Text.Preference.Merger.Type">Merger</sys:String>
     <sys:String x:Key="Text.Preference.Merger.Path">Install Path</sys:String>
     <sys:String x:Key="Text.Preference.Merger.Path.Placeholder">Input path for merge tool</sys:String>
diff --git a/src/Resources/Locales/zh_CN.xaml b/src/Resources/Locales/zh_CN.xaml
index 66224eac..96ddc01b 100644
--- a/src/Resources/Locales/zh_CN.xaml
+++ b/src/Resources/Locales/zh_CN.xaml
@@ -365,7 +365,6 @@
     <sys:String x:Key="Text.Preference.AvatarServer">头像服务</sys:String>
     <sys:String x:Key="Text.Preference.CheckUpdate">启用检测更新</sys:String>
     <sys:String x:Key="Text.Preference.UseDarkTheme">启用暗色主题</sys:String>
-    <sys:String x:Key="Text.Preference.AutoFetch">启用定时自动拉取远程更新（重启生效）</sys:String>
     <sys:String x:Key="Text.Preference.RestoreTabs">启动时恢复上次打开的仓库</sys:String>
     <sys:String x:Key="Text.Preference.EnableCrashReport">开启崩溃上报（可能涉及上报相关路径）</sys:String>
     <sys:String x:Key="Text.Preference.UseWindowsTerminal">使用 Windows Terminal 打开 Git 终端</sys:String>
@@ -380,6 +379,7 @@
     <sys:String x:Key="Text.Preference.Git.Email">邮箱</sys:String>
     <sys:String x:Key="Text.Preference.Git.Email.Placeholder">默认GIT用户邮箱</sys:String>
     <sys:String x:Key="Text.Preference.Git.CRLF">自动换行转换</sys:String>
+    <sys:String x:Key="Text.Preference.Git.AutoFetch">启用定时自动拉取远程更新（重启生效）</sys:String>
     <sys:String x:Key="Text.Preference.Merger">外部合并工具</sys:String>
     <sys:String x:Key="Text.Preference.Merger.Type">工具</sys:String>
     <sys:String x:Key="Text.Preference.Merger.Path">安装路径</sys:String>
diff --git a/src/Views/Preference.xaml b/src/Views/Preference.xaml
index b67d933b..8eb11421 100644
--- a/src/Views/Preference.xaml
+++ b/src/Views/Preference.xaml
@@ -12,7 +12,7 @@
     WindowStartupLocation="CenterOwner"
     ResizeMode="NoResize"
     Title="{DynamicResource Text.Preference}"
-    Width="500" SizeToContent="Height">
+    Width="500" Height="340">
     <Grid>
         <Grid.Resources>
             <converters:FontFamiliesToName x:Key="FontFamiliesToName"/>
@@ -52,328 +52,332 @@
             Grid.Row="1"
             HorizontalAlignment="Stretch"
             Fill="{DynamicResource Brush.Border0}"/>
+        
+        <!-- Tabs -->
+        <TabControl Grid.Row="2" Margin="0,4">
+            <!-- General Setting -->
+            <TabItem Header="{DynamicResource Text.Preference.General}">
+                <Grid Margin="0,8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                    </Grid.RowDefinitions>
 
-        <!-- Body -->
-        <Grid Grid.Row="2" Margin="16,8">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="36"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="8"/>
-                <RowDefinition Height="36"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="8"/>
-                <RowDefinition Height="36"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="6"/>
-            </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="132"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
 
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="132"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
+                    <!-- Language -->
+                    <TextBlock
+                        Grid.Row="0" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.Locale}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,8,0"/>
+                    <ComboBox
+                        Grid.Row="0" Grid.Column="1"
+                        Height="24"
+                        ItemsSource="{Binding Source={x:Static models:Locale.Supported}}"
+                        DisplayMemberPath="Name"
+                        SelectedValuePath="Resource"
+                        SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=General.Locale, Mode=TwoWay}"
+                        SelectionChanged="LocaleChanged"/>
 
-            <!-- General Group -->
-            <TextBlock
-                Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
-                Text="{DynamicResource Text.Preference.General}"
-                FontSize="16" FontWeight="DemiBold"
-                Foreground="{DynamicResource Brush.FG2}"/>
+                    <!-- System Font -->
+                    <TextBlock
+                        Grid.Row="1" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.FontFamilyWindow}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,6,0"/>
+                    <ComboBox
+                        Grid.Row="1" Grid.Column="1"
+                        Height="24"
+                        ItemsSource="{Binding Source={x:Static models:InstalledFont.GetFonts}}"
+                        SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyWindow, Mode=TwoWay, Converter={StaticResource FontFamiliesToName}}"
+                        DisplayMemberPath="Name"
+                        SelectedValuePath="Name"
+                        SelectionChanged="LocaleChanged">
+                        <ComboBox.Resources>
+                            <Style TargetType="ComboBoxItem">
+                                <Setter Property="FontFamily" Value="{Binding Name}"/>
+                                <Setter Property="ToolTip" Value="{Binding Name}"/>
+                            </Style>
+                        </ComboBox.Resources>
+                    </ComboBox>
 
-            <!-- Language -->
-            <TextBlock
-                Grid.Row="1" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.Locale}"
-                HorizontalAlignment="Right"
-                Margin="0,0,8,0"/>
-            <ComboBox
-                Grid.Row="1" Grid.Column="1"
-                Height="24"
-                ItemsSource="{Binding Source={x:Static models:Locale.Supported}}"
-                DisplayMemberPath="Name"
-                SelectedValuePath="Resource"
-                SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=General.Locale, Mode=TwoWay}"
-                SelectionChanged="LocaleChanged"/>
+                    <!-- Content Font -->
+                    <TextBlock
+                        Grid.Row="2" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.FontFamilyContent}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,6,0"/>
+                    <ComboBox
+                        Grid.Row="2" Grid.Column="1"
+                        Height="24"
+                        ItemsSource="{Binding Source={x:Static models:InstalledFont.GetFonts}}"
+                        SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=TwoWay, Converter={StaticResource FontFamiliesToName}}"
+                        DisplayMemberPath="Name"
+                        SelectedValuePath="Name"
+                        SelectionChanged="LocaleChanged">
+                        <ComboBox.Resources>
+                            <Style TargetType="ComboBoxItem">
+                                <Setter Property="FontFamily" Value="{Binding Name}"/>
+                                <Setter Property="ToolTip" Value="{Binding Name}"/>
+                            </Style>
+                        </ComboBox.Resources>
+                    </ComboBox>
 
-            <!-- System Font -->
-            <TextBlock
-                Grid.Row="2" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.FontFamilyWindow}"
-                HorizontalAlignment="Right"
-                Margin="0,0,6,0"/>
-            <ComboBox
-                Grid.Row="2" Grid.Column="1"
-                Height="24"
-                ItemsSource="{Binding Source={x:Static models:InstalledFont.GetFonts}}"
-                SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyWindow, Mode=TwoWay, Converter={StaticResource FontFamiliesToName}}"
-                DisplayMemberPath="Name"
-                SelectedValuePath="Name"
-                SelectionChanged="LocaleChanged">
-                <ComboBox.Resources>
-                    <Style TargetType="ComboBoxItem">
-                        <Setter Property="FontFamily" Value="{Binding Name}"/>
-                        <Setter Property="ToolTip" Value="{Binding Name}"/>
-                    </Style>
-                </ComboBox.Resources>
-            </ComboBox>
+                    <!-- Avatar -->
+                    <TextBlock
+                        Grid.Row="3" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.AvatarServer}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,8,0"/>
+                    <ComboBox
+                        Grid.Row="3" Grid.Column="1"
+                        Height="24"
+                        ItemsSource="{Binding Source={x:Static models:AvatarServer.Supported}}"
+                        DisplayMemberPath="Name"
+                        SelectedValuePath="Url"
+                        SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=General.AvatarServer, Mode=TwoWay}"/>
 
-            <!-- Content Font -->
-            <TextBlock
-                Grid.Row="3" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.FontFamilyContent}"
-                HorizontalAlignment="Right"
-                Margin="0,0,6,0"/>
-            <ComboBox
-                Grid.Row="3" Grid.Column="1"
-                Height="24"
-                ItemsSource="{Binding Source={x:Static models:InstalledFont.GetFonts}}"
-                SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=TwoWay, Converter={StaticResource FontFamiliesToName}}"
-                DisplayMemberPath="Name"
-                SelectedValuePath="Name"
-                SelectionChanged="LocaleChanged">
-                <ComboBox.Resources>
-                    <Style TargetType="ComboBoxItem">
-                        <Setter Property="FontFamily" Value="{Binding Name}"/>
-                        <Setter Property="ToolTip" Value="{Binding Name}"/>
-                    </Style>
-                </ComboBox.Resources>
-            </ComboBox>
+                    <!-- Enable Check For Update -->
+                    <CheckBox
+                        Grid.Row="4" Grid.Column="1"
+                        Content="{DynamicResource Text.Preference.CheckUpdate}"
+                        IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.CheckForUpdate, Mode=TwoWay}"/>
 
-            <!-- Avatar -->
-            <TextBlock
-                Grid.Row="4" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.AvatarServer}"
-                HorizontalAlignment="Right"
-                Margin="0,0,8,0"/>
-            <ComboBox
-                Grid.Row="4" Grid.Column="1"
-                Height="24"
-                ItemsSource="{Binding Source={x:Static models:AvatarServer.Supported}}"
-                DisplayMemberPath="Name"
-                SelectedValuePath="Url"
-                SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=General.AvatarServer, Mode=TwoWay}"/>
+                    <!-- Enable Dark Theme -->
+                    <CheckBox
+                        Grid.Row="5" Grid.Column="1"
+                        Content="{DynamicResource Text.Preference.UseDarkTheme}"
+                        IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.UseDarkTheme, Mode=TwoWay}"
+                        Checked="ChangeTheme" Unchecked="ChangeTheme"/>
 
-            <!-- Enable Check For Update -->
-            <CheckBox
-                Grid.Row="5" Grid.Column="1"
-                Content="{DynamicResource Text.Preference.CheckUpdate}"
-                IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.CheckForUpdate, Mode=TwoWay}"/>
+                    <!-- Restore Windows -->
+                    <CheckBox
+                        Grid.Row="6" Grid.Column="1"
+                        Content="{DynamicResource Text.Preference.RestoreTabs}"
+                        IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Restore.IsEnabled, Mode=TwoWay}"/>
 
-            <!-- Enable Dark Theme -->
-            <CheckBox
-                Grid.Row="6" Grid.Column="1"
-                Content="{DynamicResource Text.Preference.UseDarkTheme}"
-                IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.UseDarkTheme, Mode=TwoWay}"
-                Checked="ChangeTheme" Unchecked="ChangeTheme"/>
+                    <!-- Crash Report -->
+                    <CheckBox
+                        Grid.Row="7" Grid.Column="1"
+                        Content="{DynamicResource Text.Preference.EnableCrashReport}"
+                        IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.EnableCrashReport, Mode=TwoWay}"/>
 
-            <!-- Auto Fetch -->
-            <CheckBox
-                Grid.Row="7" Grid.Column="1"
-                Content="{DynamicResource Text.Preference.AutoFetch}"
-                IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.AutoFetchRemotes, Mode=TwoWay}"/>
+                    <!-- Use Windows Terminal -->
+                    <CheckBox
+                        Grid.Row="8" Grid.Column="1"
+                        Content="{DynamicResource Text.Preference.UseWindowsTerminal}"
+                        IsEnabled="{Binding ElementName=me, Path=HasWindowsTerminal}"
+                        IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.UseWindowsTerminal, Mode=TwoWay}"/>
+                </Grid>
+            </TabItem>
 
-            <!-- Restore Windows -->
-            <CheckBox
-                Grid.Row="8" Grid.Column="1"
-                Content="{DynamicResource Text.Preference.RestoreTabs}"
-                IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Restore.IsEnabled, Mode=TwoWay}"/>
+            <!-- Git Setting -->
+            <TabItem Header="{DynamicResource Text.Preference.Git}">
+                <Grid Margin="0,8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                    </Grid.RowDefinitions>
 
-            <!-- Crash Report -->
-            <CheckBox
-                Grid.Row="9" Grid.Column="1"
-                Content="{DynamicResource Text.Preference.EnableCrashReport}"
-                IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.EnableCrashReport, Mode=TwoWay}"/>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="132"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
 
-            <!-- Use Windows Terminal -->
-            <CheckBox
-                Grid.Row="10" Grid.Column="1"
-                Content="{DynamicResource Text.Preference.UseWindowsTerminal}"
-                IsEnabled="{Binding ElementName=me, Path=HasWindowsTerminal}"
-                IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.UseWindowsTerminal, Mode=TwoWay}"/>
+                    <!-- Git Executable Path -->
+                    <TextBlock
+                        Grid.Row="0" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.Git.Path}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,8,0"/>
+                    <Grid Grid.Row="0" Grid.Column="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
 
-            <!-- Git Group -->
-            <TextBlock
-                Grid.Row="12" Grid.Column="0" Grid.ColumnSpan="2"
-                Text="{DynamicResource Text.Preference.Git}"
-                FontSize="16" FontWeight="DemiBold"
-                Foreground="{DynamicResource Brush.FG2}"/>
+                        <controls:TextEdit
+                            Grid.Column="0"
+                            x:Name="editGitPath"
+                            Height="24"
+                            Text="{Binding Source={x:Static models:Preference.Instance}, Path=Git.Path, Mode=TwoWay}"
+                            Placeholder="{DynamicResource Text.Preference.Git.Path.Placeholder}"/>
+                        <controls:IconButton
+                            Grid.Column="1"
+                            Click="SelectGitPath"
+                            Width="24" Height="24"
+                            Margin="4,0,0,0" Padding="4"
+                            BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
+                            Icon="{StaticResource Icon.Folder.Open}"/>
+                    </Grid>
 
-            <!-- Git Executable Path -->
-            <TextBlock
-                Grid.Row="13" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.Git.Path}"
-                HorizontalAlignment="Right"
-                Margin="0,0,8,0"/>
-            <Grid Grid.Row="13" Grid.Column="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
+                    <!-- Git Version -->
+                    <TextBlock
+                        Grid.Row="1" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.Git.Version}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,8,0"/>
+                    <TextBlock
+                        Grid.Row="1" Grid.Column="1"
+                        x:Name="textGitVersion"
+                        Text="{Binding ElementName=me, Path=Version}"/>
 
-                <controls:TextEdit
-                    Grid.Column="0"
-                    x:Name="editGitPath"
-                    Height="24"
-                    Text="{Binding Source={x:Static models:Preference.Instance}, Path=Git.Path, Mode=TwoWay}"
-                    Placeholder="{DynamicResource Text.Preference.Git.Path.Placeholder}"/>
-                <controls:IconButton
-                    Grid.Column="1"
-                    Click="SelectGitPath"
-                    Width="24" Height="24"
-                    Margin="4,0,0,0" Padding="4"
-                    BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
-                    Icon="{StaticResource Icon.Folder.Open}"/>
-            </Grid>
+                    <!-- Default Clone Dir -->
+                    <TextBlock
+                        Grid.Row="2" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.Git.Dir}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,8,0"/>
+                    <Grid Grid.Row="2" Grid.Column="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
 
-            <!-- Git Version -->
-            <TextBlock
-                Grid.Row="14" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.Git.Version}"
-                HorizontalAlignment="Right"
-                Margin="0,0,8,0"/>
-            <TextBlock
-                Grid.Row="14" Grid.Column="1"
-                x:Name="textGitVersion"
-                Text="{Binding ElementName=me, Path=Version}"/>
+                        <controls:TextEdit
+                            Grid.Column="0"
+                            x:Name="txtGitCloneDir"
+                            Height="24"
+                            Placeholder="{DynamicResource Text.Preference.Git.Dir.Placeholder}"
+                            Text="{Binding Source={x:Static models:Preference.Instance}, Path=Git.DefaultCloneDir, Mode=TwoWay}"/>
+                        <controls:IconButton
+                            Grid.Column="1"
+                            Click="SelectGitCloneDir"
+                            Width="24" Height="24"
+                            Margin="4,0,0,0" Padding="4"
+                            BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
+                            Icon="{StaticResource Icon.Folder.Open}"/>
+                    </Grid>
 
-            <!-- Default Clone Dir -->
-            <TextBlock
-                Grid.Row="15" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.Git.Dir}"
-                HorizontalAlignment="Right"
-                Margin="0,0,8,0"/>
-            <Grid Grid.Row="15" Grid.Column="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
+                    <!-- User -->
+                    <TextBlock
+                        Grid.Row="3" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.Git.User}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,8,0"/>
+                    <controls:TextEdit
+                        Grid.Row="3" Grid.Column="1"
+                        x:Name="editGitUser"
+                        Height="24"
+                        Text="{Binding ElementName=me, Path=User, Mode=TwoWay}"
+                        Placeholder="{DynamicResource Text.Preference.Git.User.Placeholder}"/>
 
-                <controls:TextEdit
-                    Grid.Column="0"
-                    x:Name="txtGitCloneDir"
-                    Height="24"
-                    Placeholder="{DynamicResource Text.Preference.Git.Dir.Placeholder}"
-                    Text="{Binding Source={x:Static models:Preference.Instance}, Path=Git.DefaultCloneDir, Mode=TwoWay}"/>
-                <controls:IconButton
-                    Grid.Column="1"
-                    Click="SelectGitCloneDir"
-                    Width="24" Height="24"
-                    Margin="4,0,0,0" Padding="4"
-                    BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
-                    Icon="{StaticResource Icon.Folder.Open}"/>
-            </Grid>
+                    <!-- Email -->
+                    <TextBlock
+                        Grid.Row="4" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.Git.Email}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,8,0"/>
+                    <controls:TextEdit
+                        Grid.Row="4" Grid.Column="1"
+                        x:Name="editGitEmail"
+                        Height="24"
+                        Text="{Binding ElementName=me, Path=Email, Mode=TwoWay}"
+                        Placeholder="{DynamicResource Text.Preference.Git.Email.Placeholder}"/>
 
-            <!-- User -->
-            <TextBlock
-                Grid.Row="16" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.Git.User}"
-                HorizontalAlignment="Right"
-                Margin="0,0,8,0"/>
-            <controls:TextEdit
-                Grid.Row="16" Grid.Column="1"
-                x:Name="editGitUser"
-                Height="24"
-                Text="{Binding ElementName=me, Path=User, Mode=TwoWay}"
-                Placeholder="{DynamicResource Text.Preference.Git.User.Placeholder}"/>
+                    <!-- CRLF -->
+                    <TextBlock
+                        Grid.Row="5" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.Git.CRLF}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,8,0"/>  
+                    <ComboBox
+                        Grid.Row="5" Grid.Column="1"
+                        x:Name="editGitCrlf"
+                        Height="24"
+                        ItemsSource="{Binding Source={x:Static models:CRLFOption.Supported}}"
+                        SelectedValuePath="Value"
+                        SelectedValue="{Binding ElementName=me, Path=CRLF, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal" Height="20">
+                                    <TextBlock Text="{Binding Display}" Margin="2,0"/>
+                                    <TextBlock Text="{Binding Desc}" Margin="8,0,0,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
 
-            <!-- Email -->
-            <TextBlock
-                Grid.Row="17" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.Git.Email}"
-                HorizontalAlignment="Right"
-                Margin="0,0,8,0"/>
-            <controls:TextEdit
-                Grid.Row="17" Grid.Column="1"
-                x:Name="editGitEmail"
-                Height="24"
-                Text="{Binding ElementName=me, Path=Email, Mode=TwoWay}"
-                Placeholder="{DynamicResource Text.Preference.Git.Email.Placeholder}"/>
+                    <!-- Auto Fetch -->
+                    <CheckBox
+                        Grid.Row="6" Grid.Column="1"
+                        Content="{DynamicResource Text.Preference.Git.AutoFetch}"
+                        IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Git.AutoFetchRemotes, Mode=TwoWay}"/>
+                </Grid>
+            </TabItem>
 
-            <!-- CRLF -->
-            <TextBlock
-                Grid.Row="18" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.Git.CRLF}"
-                HorizontalAlignment="Right"
-                Margin="0,0,8,0"/>
-            <ComboBox
-                Grid.Row="18" Grid.Column="1"
-                x:Name="editGitCrlf"
-                Height="24"
-                ItemsSource="{Binding Source={x:Static models:CRLFOption.Supported}}"
-                SelectedValuePath="Value"
-                SelectedValue="{Binding ElementName=me, Path=CRLF, Mode=TwoWay}">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Orientation="Horizontal" Height="20">
-                            <TextBlock Text="{Binding Display}" Margin="2,0"/>
-                            <TextBlock Text="{Binding Desc}" Margin="8,0,0,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
-                        </StackPanel>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
+            <TabItem Header="{DynamicResource Text.Preference.Merger}">
+                <Grid Margin="0,8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="28"/>
+                        <RowDefinition Height="28"/>
+                    </Grid.RowDefinitions>
 
-            <!-- Merge Tool Group -->
-            <TextBlock
-                Grid.Row="20" Grid.Column="0" Grid.ColumnSpan="2"
-                Text="{DynamicResource Text.Preference.Merger}"
-                FontSize="17" FontWeight="DemiBold"
-                Foreground="{DynamicResource Brush.FG2}"/>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="132"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    
+                    <!-- Merge Tool Type -->
+                    <TextBlock
+                        Grid.Row="0" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.Merger.Type}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,8,0"/>
+                    <ComboBox
+                        Grid.Row="0" Grid.Column="1"
+                        Height="24"
+                        ItemsSource="{Binding Source={x:Static models:MergeTool.Supported}}"
+                        DisplayMemberPath="Name"
+                        SelectedValuePath="Type"
+                        SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=MergeTool.Type, Mode=TwoWay}"
+                        SelectionChanged="MergeToolChanged"/>
 
-            <!-- Merge Tool Type -->
-            <TextBlock
-                Grid.Row="21" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.Merger.Type}"
-                HorizontalAlignment="Right"
-                Margin="0,0,8,0"/>
-            <ComboBox
-                Grid.Row="21" Grid.Column="1"
-                Height="24"
-                ItemsSource="{Binding Source={x:Static models:MergeTool.Supported}}"
-                DisplayMemberPath="Name"
-                SelectedValuePath="Type"
-                SelectedValue="{Binding Source={x:Static models:Preference.Instance}, Path=MergeTool.Type, Mode=TwoWay}"
-                SelectionChanged="MergeToolChanged"/>
+                    <!-- Merge Tool Executable Path -->
+                    <TextBlock
+                        Grid.Row="1" Grid.Column="0"
+                        Text="{DynamicResource Text.Preference.Merger.Path}"
+                        HorizontalAlignment="Right"
+                        Margin="0,0,8,0"/>
+                    <Grid Grid.Row="1" Grid.Column="1">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
 
-            <!-- Merge Tool Executable Path -->
-            <TextBlock
-                Grid.Row="22" Grid.Column="0"
-                Text="{DynamicResource Text.Preference.Merger.Path}"
-                HorizontalAlignment="Right"
-                Margin="0,0,8,0"/>
-            <Grid Grid.Row="22" Grid.Column="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-
-                <controls:TextEdit
-                    Grid.Column="0"
-                    Height="24"
-                    x:Name="txtMergeExec"
-                    Placeholder="{DynamicResource Text.Preference.Merger.Path.Placeholder}"
-                    Text="{Binding Source={x:Static models:Preference.Instance}, Path=MergeTool.Path, Mode=TwoWay}"/>
-                <controls:IconButton
-                    Grid.Column="1"
-                    Click="SelectMergeTool"
-                    Width="24" Height="24"
-                    Margin="4,0,0,0" Padding="4"
-                    BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
-                    Icon="{StaticResource Icon.Folder.Open}"/>
-            </Grid>
-        </Grid>
+                        <controls:TextEdit
+                            Grid.Column="0"
+                            Height="24"
+                            x:Name="txtMergeExec"
+                            Placeholder="{DynamicResource Text.Preference.Merger.Path.Placeholder}"
+                            Text="{Binding Source={x:Static models:Preference.Instance}, Path=MergeTool.Path, Mode=TwoWay}"/>
+                        <controls:IconButton
+                            Grid.Column="1"
+                            Click="SelectMergeTool"
+                            Width="24" Height="24"
+                            Margin="4,0,0,0" Padding="4"
+                            BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
+                            Icon="{StaticResource Icon.Folder.Open}"/>
+                    </Grid>
+                </Grid>
+            </TabItem>
+        </TabControl>
     </Grid>
 </controls:Window>