diff --git a/SubRenamer/Views/SettingsWindow.axaml b/SubRenamer/Views/SettingsWindow.axaml
index 4315122..42adeb3 100644
--- a/SubRenamer/Views/SettingsWindow.axaml
+++ b/SubRenamer/Views/SettingsWindow.axaml
@@ -5,8 +5,11 @@
         xmlns:vm="using:SubRenamer.ViewModels"
         mc:Ignorable="d"
         WindowStartupLocation="CenterOwner"
-        Width="500"
+        Width="800"
+        MinWidth="860"
+        MinHeight="500"
         SizeToContent="Height"
+        CanResize="True"
         x:Class="SubRenamer.Views.SettingsWindow"
         x:DataType="vm:SettingsViewModel"
         Title="{DynamicResource App.Strings.SettingsTitle}">
@@ -33,89 +36,110 @@
                 </Style>     
         </Window.Styles>
         
-        <StackPanel Margin="20">
-                <StackPanel Orientation="Horizontal" Spacing="15">
+        <DockPanel Margin="20" LastChildFill="True">
+                        
+            <!-- Bottom Section -->
+            <StackPanel DockPanel.Dock="Bottom" Margin="0,20,0,0">
+                <Border BorderThickness=".5" BorderBrush="#D2D4D5"/>
+                <Border Height="15" />
+                
+                <Grid ColumnDefinitions="*,Auto">
+                    <!-- Left Side Text -->
+                    <TextBlock Grid.Column="0" TextWrapping="Wrap" FontSize="13" LineHeight="26" Foreground="#5f6b7c">
+                        <TextBlock.Inlines>
+                            <TextBlock Text="{DynamicResource App.Strings.SettingsOpenSourceProgram}" />
+                            <LineBreak />
+                            <TextBlock Text="{DynamicResource App.Strings.SettingsConsiderStar1}" />
+                            <Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsConsiderStar2}" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer" />
+                            <TextBlock Text="{DynamicResource App.Strings.SettingsConsiderStar3}" />
+                        </TextBlock.Inlines>
+                    </TextBlock>
+                    
+                    <!-- Right Side Buttons -->
+                    <StackPanel Grid.Column="1" Margin="20,0,0,0" Orientation="Vertical" Spacing="10" HorizontalAlignment="Right">
+                        <Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsFeedback}" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer/issues/new" HorizontalAlignment="Right" />
+                        <Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsChangelog}" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer/releases" HorizontalAlignment="Right" />
+                    </StackPanel>
+                </Grid>
+            </StackPanel>
+            
+            <!-- Main Content -->
+            <Grid ColumnDefinitions="*, 30, *">
+                <!-- Left Column -->
+                <StackPanel Grid.Column="0">
+                    <StackPanel Orientation="Horizontal" Spacing="15">
                         <TextBlock Text="{DynamicResource App.Strings.SettingsLanguage}" FontSize="14" VerticalAlignment="Center" />
                         <ComboBox MaxDropDownHeight="200" SelectedIndex="{Binding LanguageIndex}" ItemsSource="{Binding LanguageTitles}">
-                                <ComboBox.ItemTemplate>
-                                        <DataTemplate>
-                                                <TextBlock Text="{Binding}" />
-                                        </DataTemplate>
-                                </ComboBox.ItemTemplate>
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
                         </ComboBox>
-                </StackPanel>
-                <Border Height="15" />
-                <Border BorderThickness=".5" BorderBrush="#D2D4D5"></Border>
-                <Border Height="15" />
-                <CheckBox IsChecked="{Binding BackupEnabled}" Content="{DynamicResource App.Strings.SettingsBackupOriginalSubtitles}" />
-                <TextBlock Text="{DynamicResource App.Strings.SettingsBackupHint}" Foreground="Gray" Margin="30 0 30 10" FontSize="13" Padding="0" TextWrapping="Wrap" />
-                <!-- <CheckBox>确认删除对话框</CheckBox> -->
-                <!-- <CheckBox>显示文件完整路径</CheckBox> -->
-                <CheckBox IsChecked="{Binding FileConflictFilter}" Content="{DynamicResource App.Strings.SettingsLanguageFilterDialog}" />
-                <TextBlock Text="{DynamicResource App.Strings.SettingsLanguageFilterHint}" Foreground="Gray" FontSize="13" Padding="0" Margin="30 0 30 10" TextWrapping="Wrap" />
-                <CheckBox IsChecked="{Binding KeepLangExt}" IsEnabled="{Binding !CustomLangExtEnabled}" Content="{DynamicResource App.Strings.SettingsKeepLanguageSuffix}" />
-                <TextBlock Text="{DynamicResource App.Strings.SettingsKeepLanguageSuffixHint}" Foreground="Gray" Margin="30 0 30 10" FontSize="13" Padding="0" TextWrapping="Wrap" />
-                <CheckBox IsChecked="{Binding CustomLangExtEnabled}" Content="{DynamicResource App.Strings.SettingsAddCustomSuffix}" />
-                <StackPanel Margin="30 0 0 0">
+                    </StackPanel>
+                    
+                    <Border Height="15" />
+                    <Border BorderThickness=".5" BorderBrush="#D2D4D5"/>
+                    <Border Height="15" />
+                    
+                    <CheckBox IsChecked="{Binding BackupEnabled}" Content="{DynamicResource App.Strings.SettingsBackupOriginalSubtitles}" />
+                    <TextBlock Text="{DynamicResource App.Strings.SettingsBackupHint}" Foreground="Gray" Margin="30 0 30 10" FontSize="13" Padding="0" TextWrapping="Wrap" />
+                    
+                    <CheckBox IsChecked="{Binding FileConflictFilter}" Content="{DynamicResource App.Strings.SettingsLanguageFilterDialog}" />
+                    <TextBlock Text="{DynamicResource App.Strings.SettingsLanguageFilterHint}" Foreground="Gray" FontSize="13" Padding="0" Margin="30 0 30 10" TextWrapping="Wrap" />
+                    
+                    <CheckBox IsChecked="{Binding KeepLangExt}" IsEnabled="{Binding !CustomLangExtEnabled}" Content="{DynamicResource App.Strings.SettingsKeepLanguageSuffix}" />
+                    <TextBlock Text="{DynamicResource App.Strings.SettingsKeepLanguageSuffixHint}" Foreground="Gray" Margin="30 0 30 10" FontSize="13" Padding="0" TextWrapping="Wrap" />
+                    
+                    <CheckBox IsChecked="{Binding CustomLangExtEnabled}" Content="{DynamicResource App.Strings.SettingsAddCustomSuffix}" />
+                    <StackPanel Margin="30 0 0 0">
                         <TextBlock Text="{DynamicResource App.Strings.SettingsAddCustomSuffixHint}" Foreground="Gray" FontSize="13" Padding="0" Margin="0 0 0 10" TextWrapping="Wrap" />
                         <TextBox IsEnabled="{Binding CustomLangExtEnabled}" Watermark="{DynamicResource App.Strings.SettingsCustomSuffixWatermark}" Text="{Binding CustomLangExt}" />
+                    </StackPanel>
                 </StackPanel>
-                <Border Height="15" />
-                <CheckBox IsChecked="{Binding FileClsExtAppendEnabled}" Content="{DynamicResource App.Strings.SettingsFileFormatExtension}" />
-                <TextBlock Text="{DynamicResource App.Strings.SettingsFileFormatExtensionHint}" Foreground="Gray" Margin="30 0 30 8" FontSize="13" Padding="0" TextWrapping="Wrap" />
-                <Grid IsEnabled="{Binding FileClsExtAppendEnabled}"  Margin="30 0 0 0" HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*">
+                
+                <!-- Right Column -->
+                <StackPanel Grid.Column="2">
+                    <CheckBox IsChecked="{Binding FileClsExtAppendEnabled}" Content="{DynamicResource App.Strings.SettingsFileFormatExtension}" />
+                    <TextBlock Text="{DynamicResource App.Strings.SettingsFileFormatExtensionHint}" Foreground="Gray" Margin="30 0 30 8" FontSize="13" Padding="0" TextWrapping="Wrap" />
+                    <Grid IsEnabled="{Binding FileClsExtAppendEnabled}"  Margin="30 0 0 0" HorizontalAlignment="Stretch" ColumnDefinitions="*,10,*">
                         <StackPanel Grid.Column="0">
-                                <TextBlock Margin="0 5 0 10" FontSize="13" Text="{DynamicResource App.Strings.SettingsSubtitleFormatExtension}" />
-                                <TextBox Watermark="{DynamicResource App.Strings.SettingsSubtitleFormatWatermark}" Text="{Binding SubtitleExtAppend}" />  
+                            <TextBlock Margin="0 5 0 10" FontSize="13" Text="{DynamicResource App.Strings.SettingsSubtitleFormatExtension}" />
+                            <TextBox Watermark="{DynamicResource App.Strings.SettingsSubtitleFormatWatermark}" Text="{Binding SubtitleExtAppend}" />  
                         </StackPanel>
                         <StackPanel Grid.Column="2">
-                                <TextBlock Margin="0 5 0 10" FontSize="13" Text="{DynamicResource App.Strings.SettingsVideoFormatExtension}" />
-                                <TextBox Watermark="{DynamicResource App.Strings.SettingsVideoFormatWatermark}" Text="{Binding VideoExtAppend}" />
+                            <TextBlock Margin="0 5 0 10" FontSize="13" Text="{DynamicResource App.Strings.SettingsVideoFormatExtension}" />
+                            <TextBox Watermark="{DynamicResource App.Strings.SettingsVideoFormatWatermark}" Text="{Binding VideoExtAppend}" />
                         </StackPanel>
-                </Grid>
-                <Border Height="15" />
-                <CheckBox IsChecked="{Binding UpdateCheckEnabled}" Content="{DynamicResource App.Strings.SettingsUpdateCheck}" />
-                
-                <Border Height="15" />
-                <Border BorderThickness=".5" BorderBrush="#D2D4D5"></Border>
-                <Border Height="15" />
-                
-                <Grid ColumnDefinitions="3*,40,*">
-                        <StackPanel Grid.Column="0" Orientation="Vertical">
-                                <StackPanel Orientation="Horizontal">
-                                        <TextBlock Text="{DynamicResource App.Strings.SettingsSubSyncProgram}" FontSize="14" VerticalAlignment="Center" />
-                                        <TextBlock IsVisible="{Binding SubSyncExeDownloaded}" FontSize="14" VerticalAlignment="Center" Foreground="{StaticResource SystemAccentColor}" Text="{DynamicResource App.Strings.SettingsSubSyncInstalled}" />
-                                        <TextBlock IsVisible="{Binding !SubSyncExeDownloaded}" FontSize="14" VerticalAlignment="Center" Text="{DynamicResource App.Strings.SettingsSubSyncNotInstalled}" />
-                                </StackPanel>
-                                <TextBlock Text="{DynamicResource App.Strings.SettingsSubSyncDesc}" Foreground="Gray" Margin="0 10 0 0" FontSize="13" Padding="0" TextWrapping="Wrap" />
+                    </Grid>
+                    
+                    <Border Height="50" />
+                    
+                    <Border Height="15" />
+                    <Border BorderThickness=".5" BorderBrush="#D2D4D5"/>
+                    <Border Height="15" />
+                    
+                    <Grid ColumnDefinitions="2.5*,20,*">
+                        <StackPanel Grid.Column="0" Orientation="Vertical" VerticalAlignment="Center">
+                            <TextBlock TextWrapping="Wrap" FontSize="14">
+                                <TextBlock.Inlines>
+                                    <TextBlock Text="{DynamicResource App.Strings.SettingsSubSyncProgram}" /><TextBlock IsVisible="{Binding SubSyncExeDownloaded}" Foreground="{StaticResource SystemAccentColor}" Text="{DynamicResource App.Strings.SettingsSubSyncInstalled}" /><TextBlock IsVisible="{Binding !SubSyncExeDownloaded}" Text="{DynamicResource App.Strings.SettingsSubSyncNotInstalled}" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                            <TextBlock Text="{DynamicResource App.Strings.SettingsSubSyncDesc}" Foreground="Gray" Margin="0 10 0 0" FontSize="12" Padding="0" TextWrapping="Wrap" />
                         </StackPanel>
                         <StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
-                                <Button FontSize="12" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Command="{Binding DownloadSubSyncExeCommand}" Content="{DynamicResource App.Strings.SettingsSubSyncDownload}" />
-                                <Button FontSize="12" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/ffsubsync-bin" Content="{DynamicResource App.Strings.SettingsSubSyncViewReadme}" />
+                            <Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Command="{Binding DownloadSubSyncExeCommand}" Content="{DynamicResource App.Strings.SettingsSubSyncDownload}" />
+                            <Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/ffsubsync-bin" Content="{DynamicResource App.Strings.SettingsSubSyncViewReadme}" />
                         </StackPanel>
-                </Grid>
-                
-                <Border Height="15" />
-                <Border BorderThickness=".5" BorderBrush="#D2D4D5"></Border>
-                <Border Height="15" />
-                
-                <TextBlock TextWrapping="Wrap" FontSize="13" LineHeight="26" Foreground="#5f6b7c">
-                        <TextBlock.Inlines>
-                                <Run Text="{DynamicResource App.Strings.SettingsOpenSourceProgram}" />
-                                <LineBreak />
-                                <Run Text="{DynamicResource App.Strings.SettingsConsiderStar1}" />
-                                <Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsConsiderStar2}" Margin="0 5 0 0" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer" />
-                                <Run Text="{DynamicResource App.Strings.SettingsConsiderStar3}" />
-                        </TextBlock.Inlines>
-                </TextBlock>
-                
-                <Border Height="15" />
-                <Border BorderThickness=".5" BorderBrush="#D2D4D5"></Border>
-                
-                <Border Height="15" />
-                <StackPanel Orientation="Horizontal" Spacing="15">
-                        <Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsFeedback}" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer/issues/new" />
-                        <Button Classes="hyperlink" Content="{DynamicResource App.Strings.SettingsChangelog}" Command="{Binding OpenLinkCommand}" CommandParameter="https://github.com/qwqcode/SubRenamer/releases" />
+                    </Grid>
+                    
+                    <Border Height="15" />
+                    <Border BorderThickness=".5" BorderBrush="#D2D4D5"/>
+                    <Border Height="15" />
+                    
+                    <CheckBox IsChecked="{Binding UpdateCheckEnabled}" Content="{DynamicResource App.Strings.SettingsUpdateCheck}" />
                 </StackPanel>
-        </StackPanel>
+            </Grid>
+        </DockPanel>
 </Window>