diff --git a/LiaoTian_Cup/Dictionary/BaseStyle.xaml b/LiaoTian_Cup/Dictionary/BaseStyle.xaml
index 1af84b8..fc78f32 100644
--- a/LiaoTian_Cup/Dictionary/BaseStyle.xaml
+++ b/LiaoTian_Cup/Dictionary/BaseStyle.xaml
@@ -1,69 +1,71 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--存储常用的控件Style格式-->
-    
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  存储常用的控件Style格式  -->
+
     <Style x:Key="BaseButton" TargetType="Button">
-        <Setter Property="Width" Value="120"></Setter>
-        <Setter Property="Height" Value="30"></Setter>
-        <Setter Property="VerticalAlignment" Value="Center"></Setter>
-        <Setter Property="HorizontalAlignment" Value="Right"></Setter>
+        <Setter Property="Width" Value="120" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
-    
+
     <Style x:Key="BaseCheckBox" TargetType="CheckBox">
-        <Setter Property="Width" Value="120"></Setter>
-        <Setter Property="Height" Value="30"></Setter>
-        <Setter Property="VerticalAlignment" Value="Center"></Setter>
-        <Setter Property="HorizontalAlignment" Value="Center"></Setter>
-        <Setter Property="FontSize" Value="16"></Setter>
-        <Setter Property="RenderTransformOrigin" Value="0.5,0.5"></Setter>
+        <Setter Property="Width" Value="120" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
     </Style>
-    
+
     <Style x:Key="BaseLabel" TargetType="Label">
-        <Setter Property="FontSize" Value="20"></Setter>
-        <Setter Property="FontWeight" Value="Bold"></Setter>
-        <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-        <Setter Property="VerticalAlignment" Value="Center"></Setter>
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
-    
+
     <Style x:Key="BaseTextBox" TargetType="TextBox">
-        <Setter Property="Focusable" Value="False"></Setter>
-        <Setter Property="FontSize" Value="20"></Setter>
-        <Setter Property="VerticalAlignment" Value="Center"></Setter>
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
     <Style x:Key="BaseComboBox" TargetType="ComboBox">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="125"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="HorizontalAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="IsEditable" Value="False"/>
+        <Setter Property="Height" Value="30" />
+        <Setter Property="Width" Value="125" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="IsEditable" Value="False" />
     </Style>
 
     <Style x:Key="GridMinImage" TargetType="Image">
-        <Setter Property="Height" Value="60"/>
-        <Setter Property="Width" Value="60"/>
-        <Setter Property="Margin" Value="15,0,0,0"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="Stretch" Value="Fill"/>
+        <Setter Property="Height" Value="60" />
+        <Setter Property="Width" Value="60" />
+        <Setter Property="Margin" Value="15,0,0,0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Stretch" Value="Fill" />
     </Style>
 
-    <Style x:Key="ClickableImg" TargetType="Image" BasedOn="{StaticResource GridMinImage}">
-        <Setter Property="Cursor" Value="Hand"/>
+    <Style
+        x:Key="ClickableImg"
+        BasedOn="{StaticResource GridMinImage}"
+        TargetType="Image">
+        <Setter Property="Cursor" Value="Hand" />
     </Style>
 
     <Style x:Key="MapImg" TargetType="Image">
-        <Setter Property="Height" Value="85"/>
-        <Setter Property="Width" Value="285"/>
-        <Setter Property="Stretch" Value="UniformToFill"/>
+        <Setter Property="Height" Value="85" />
+        <Setter Property="Width" Value="285" />
+        <Setter Property="Stretch" Value="UniformToFill" />
     </Style>
 
     <Style x:Key="MapName" TargetType="TextBlock">
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="TextAlignment" Value="Center"/>
-        <Setter Property="FontSize" Value="18"/>
-        <Setter Property="Foreground" Value="Red"/>
-        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="Red" />
+        <Setter Property="FontWeight" Value="Bold" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
index a31fdde..9bfdd5d 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.Designer.cs
@@ -268,7 +268,7 @@ public static string HasSelectCommanders {
         }
         
         /// <summary>
-        ///   查找类似 Free choice mutators picked: 的本地化字符串。
+        ///   查找类似 Free mutators choiced: 的本地化字符串。
         /// </summary>
         public static string HasSelectFreeMutators {
             get {
@@ -304,7 +304,7 @@ public static string LangBtn {
         }
         
         /// <summary>
-        ///   查找类似 聊天杯 LiaoTian_Cup v0.2.4 - Programmed by B1ackSand 的本地化字符串。
+        ///   查找类似 聊天杯 LiaoTian_Cup v0.2.5 - Programmed by B1ackSand 的本地化字符串。
         /// </summary>
         public static string MainWindowTitle {
             get {
@@ -340,7 +340,7 @@ public static string MultilineMutators {
         }
         
         /// <summary>
-        ///   查找类似 Weekly mutation name: 的本地化字符串。
+        ///   查找类似 Weekly mutation: 的本地化字符串。
         /// </summary>
         public static string MutationName {
             get {
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.resx b/LiaoTian_Cup/Dictionary/I18n/Lang.resx
index 574a56f..e14f88b 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.resx
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.resx
@@ -136,7 +136,7 @@
     <value>Player(s): </value>
   </data>
   <data name="MutationName" xml:space="preserve">
-    <value>Weekly mutation name:</value>
+    <value>Weekly mutation:</value>
   </data>
   <data name="MapName" xml:space="preserve">
     <value>Map name:</value>
@@ -154,7 +154,7 @@
     <value>Awesome Cmdrs.:</value>
   </data>
   <data name="HasSelectFreeMutators" xml:space="preserve">
-    <value>Free choice mutators picked:</value>
+    <value>Free mutators choiced:</value>
   </data>
   <data name="HasSelectCommanders" xml:space="preserve">
     <value>Commander(s) picked:</value>
@@ -196,7 +196,7 @@
     <value>you need to pick commander</value>
   </data>
   <data name="MainWindowTitle" xml:space="preserve">
-    <value>聊天杯 LiaoTian_Cup v0.2.4 - Programmed by B1ackSand</value>
+    <value>聊天杯 LiaoTian_Cup v0.2.5 - Programmed by B1ackSand</value>
   </data>
   <data name="ThreeMutatorsMode" xml:space="preserve">
     <value>3 mutators mode</value>
diff --git a/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx b/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
index ef598fc..8e0de20 100644
--- a/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
+++ b/LiaoTian_Cup/Dictionary/I18n/Lang.zh.resx
@@ -196,7 +196,7 @@
     <value>未选择指挥官</value>
   </data>
   <data name="MainWindowTitle" xml:space="preserve">
-    <value>聊天杯 LiaoTian_Cup v0.2.4 - Programmed by B1ackSand</value>
+    <value>聊天杯 LiaoTian_Cup v0.2.5 - Programmed by B1ackSand</value>
   </data>
   <data name="ThreeMutatorsMode" xml:space="preserve">
     <value>3因子模式</value>
diff --git a/LiaoTian_Cup/LiaoTian_Cup.csproj b/LiaoTian_Cup/LiaoTian_Cup.csproj
index 217e629..4476570 100644
--- a/LiaoTian_Cup/LiaoTian_Cup.csproj
+++ b/LiaoTian_Cup/LiaoTian_Cup.csproj
@@ -9,7 +9,7 @@
 	  <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 	  <UseWPF>true</UseWPF>
 	  <ApplicationIcon>Resources\Logo\icon.ico</ApplicationIcon>
-	  <Version>0.2.4</Version>
+	  <Version>0.2.5</Version>
 	  <Authors>B1ackSand</Authors>
 	  <ApplicationManifest>app.manifest</ApplicationManifest>
 	  <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -320,6 +320,7 @@
     <PackageReference Include="DeepCloner" Version="0.10.4" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.11" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
index 1deadca..1a9990c 100644
--- a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml
@@ -6,7 +6,7 @@
     xmlns:local="clr-namespace:LiaoTian_Cup.Dictionary.I18n"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="1180"
-    Height="890"
+    Height="880"
     Background="#ACFFFFFF"
     mc:Ignorable="d">
 
@@ -17,61 +17,88 @@
         <Style BasedOn="{StaticResource BaseTextBox}" TargetType="TextBox" />
     </Page.Resources>
 
-
-    <Grid ShowGridLines="True">
+    <Grid ShowGridLines="False">
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
             <RowDefinition Height="160" />
-            <RowDefinition Height="80" />
-            <RowDefinition Height="80" />
+            <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Margin="0,10,10,0"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <ComboBox
-                x:Name="ModeBox"
-                Width="130"
-                IsEditable="False"
-                Style="{StaticResource BaseComboBox}"
-                Text="{Binding Path=modeName}">
-                <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-                <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-            </ComboBox>
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <Grid>
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="190"
+                    Margin="0,0,0,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="20,10,10,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <ComboBox
+                    x:Name="ModeBox"
+                    Width="130"
+                    IsEditable="False"
+                    Style="{StaticResource BaseComboBox}"
+                    Text="{Binding Path=modeName}">
+                    <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                    <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
                 x:Name="RandStartBtn"
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="6">
             <Button
                 Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
 
         <Grid Grid.Row="1">
+            <Label x:Name="MapLabel" Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="6">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource MapImg}" TargetType="Image">
@@ -83,10 +110,7 @@
                         <Setter Property="Margin" Value="5,10,0,0" />
                     </Style>
                 </StackPanel.Resources>
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
+
                 <StackPanel>
                     <Image
                         x:Name="MapImg1"
@@ -111,7 +135,26 @@
                 Content="{Binding [ConfirmMapBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
 
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="2" Grid.ColumnSpan="2">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <Grid>
+                    <Label x:Name="NegativeLabel" Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+                <Grid Grid.Row="1">
+                    <Label x:Name="MultilineLabel" Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="*" />
@@ -125,10 +168,6 @@
 
                 <Grid Grid.Row="0">
                     <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
                         <Image x:Name="NegativeFactor1" Margin="0,0,0,0" />
                         <Image x:Name="NegativeFactor2" />
                         <Image x:Name="NegativeFactor3" />
@@ -139,95 +178,133 @@
                 </Grid>
                 <Grid Grid.Row="1">
                     <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
                         <Image x:Name="MultiFactor1" Margin="0,0,0,0" />
                         <Image x:Name="MultiFactor2" />
                         <Image x:Name="MultiFactor3" />
                         <Image x:Name="MultiFactor4" />
                         <Image x:Name="MultiFactor5" />
                     </StackPanel>
-                    <Button
-                        x:Name="BaseConfirmBtn"
-                        Margin="0,0,20,0"
-                        Click="Button_BaseConfirm_Click"
-                        Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
-                        IsEnabled="False" />
                 </Grid>
-
             </Grid>
         </Grid>
+        <Grid Grid.Row="2" Grid.Column="6">
+            <Button
+                x:Name="BaseConfirmBtn"
+                Margin="0,0,20,0"
+                Click="Button_BaseConfirm_Click"
+                Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
+                IsEnabled="False" />
+        </Grid>
 
-        <Grid Grid.Row="3">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
-                <Image x:Name="SelectFactor2" />
-                <Image x:Name="SelectFactor3" />
-                <Image x:Name="SelectFactor4" />
-                <Image x:Name="SelectFactor5" />
-                <Image x:Name="SelectFactor6" />
-                <Image x:Name="SelectFactor7" />
-                <Image x:Name="SelectFactor8" />
-            </StackPanel>
+        <Grid Grid.Row="3" Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+            <Grid Grid.Row="1">
+                <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
         </Grid>
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="5">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-        <Grid Grid.Row="4">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+                <Grid Grid.Row="0">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
-                <Image x:Name="BeforeCommander2" />
-                <Image x:Name="BeforeCommander3" />
-                <Image x:Name="BeforeCommander4" />
-                <Image x:Name="BeforeCommander5" />
-                <Image x:Name="BeforeCommander6" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                <Image x:Name="AfterCommander2" />
-                <Image x:Name="AfterCommander3" />
-                <Image x:Name="AfterCommander4" />
-            </StackPanel>
+                        <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
+                        <Image x:Name="SelectFactor2" />
+                        <Image x:Name="SelectFactor3" />
+                        <Image x:Name="SelectFactor4" />
+                        <Image x:Name="SelectFactor5" />
+                        <Image x:Name="SelectFactor6" />
+                        <Image x:Name="SelectFactor7" />
+                        <Image x:Name="SelectFactor8" />
+                    </StackPanel>
+                </Grid>
+
+                <Grid Grid.Row="1">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
+
+
+                        <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="BeforeCommander2" />
+                        <Image x:Name="BeforeCommander3" />
+                        <Image x:Name="BeforeCommander4" />
+                        <Image x:Name="BeforeCommander5" />
+                        <Image x:Name="BeforeCommander6" />
+                        <Label
+                            x:Name="NewCmdrLabel"
+                            Margin="18,0,0,0"
+                            Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="AfterCommander2" />
+                        <Image x:Name="AfterCommander3" />
+                        <Image x:Name="AfterCommander4" />
+                    </StackPanel>
+                </Grid>
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="5">
+        <Grid Grid.Row="4" Grid.ColumnSpan="2">
             <Grid.RowDefinitions>
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />
                 <RowDefinition Height="80" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+            <Grid>
+                <Label Margin="0,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+            <Grid Grid.Row="1">
+                <Label Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
 
+            <Grid Grid.Row="2">
+                <Label Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="3">
+                <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="2"
+            Grid.ColumnSpan="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="100" />
+                <RowDefinition Height="100" />
+                <RowDefinition Height="80" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
             <Grid Grid.Row="0">
-                <Line
-                    Stroke="Gray"
-                    StrokeThickness="6"
-                    X1="0"
-                    X2="1180"
-                    Y1="0"
-                    Y2="0" />
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
-                    <Image
-                        x:Name="HasSelectMap"
-                        Margin="10,0,0,0"
-                        Style="{StaticResource MapImg}" />
+
+                    <Image x:Name="HasSelectMap" Style="{StaticResource MapImg}" />
                     <TextBlock
                         x:Name="MapTip"
-                        Margin="50,0,0,0"
+                        Margin="18,0,0,0"
                         VerticalAlignment="Center"
                         FontSize="20"
                         FontWeight="Bold"
@@ -244,7 +321,7 @@
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
+
                     <Image x:Name="HasSelectBaseFactor1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectBaseFactor2" />
                     <Image x:Name="HasSelectBaseFactor3" />
@@ -259,13 +336,6 @@
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label
-                        Margin="18,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                        FontSize="20"
-                        FontWeight="Bold" />
                     <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectFactor2" />
                     <Image x:Name="HasSelectFactor3" />
@@ -281,7 +351,7 @@
                             <EventSetter Event="MouseLeftButtonDown" Handler="CancelCommander_MouseDown" />
                         </Style>
                     </StackPanel.Resources>
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+
                     <Image x:Name="HasSelectCommander1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectCommander2" />
                     <TextBlock
@@ -299,5 +369,44 @@
                     Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
             </Grid>
         </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="6"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs
index d400cbc..b0a8314 100644
--- a/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/DoublesModeWindow.xaml.cs
@@ -6,6 +6,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace LiaoTian_Cup
@@ -22,6 +23,7 @@ public partial class DoublesModeWindow : Page, INotifyPropertyChanged
         private List<Image> hasSelectFactor = new List<Image>();
         private List<Image> hasSelectCommander = new List<Image>(2);
         private Image hasSelectMap = new Image();
+        
 
 
         //初始化工具
@@ -117,6 +119,13 @@ public void ResetFunc()
             hasSelectMap = new Image();
             ClearRandomMaps();
             FlashHasSelectMap();
+
+            MapLabel.Foreground = Brushes.Black;
+            NegativeLabel.Foreground = Brushes.Black;
+            MultilineLabel.Foreground = Brushes.Black;
+            FreeLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
         //开始随机事件响应
@@ -155,6 +164,7 @@ private void ShowRandomMaps()
             MapName1.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[0]]);
             MapName2.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[1]]);
             MapName3.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[2]]);
+            MapLabel.Foreground = Brushes.Red;
         }
 
         //点击地图图片事件响应
@@ -209,6 +219,7 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
                 Warn.Text = Dictionary.I18n.Lang.ResourceManager.GetString("MapWarn");
                 return;
             }
+            MapLabel.Foreground = Brushes.Gray;
             SetRandMapEnable(false);
             ShowBaseNegativeFactor();
             ShowBaseMultiFactor();
@@ -225,6 +236,8 @@ private void ShowBaseNegativeFactor()
             NegativeFactor4.Source = new BitmapImage(new Uri(factorDir + FileData.baseNegativeFactorInfo[3] + ".png", UriKind.Relative));
             NegativeFactor5.Source = new BitmapImage(new Uri(factorDir + FileData.baseNegativeFactorInfo[4] + ".png", UriKind.Relative));
             NegativeFactor6.Source = new BitmapImage(new Uri(factorDir + FileData.baseNegativeFactorInfo[5] + ".png", UriKind.Relative));
+
+            NegativeLabel.Foreground = Brushes.Red;
         }
 
         //多线因子显示
@@ -235,6 +248,8 @@ private void ShowBaseMultiFactor()
             MultiFactor3.Source = new BitmapImage(new Uri(factorDir + FileData.baseMultiFactorInfo[2] + ".png", UriKind.Relative));
             MultiFactor4.Source = new BitmapImage(new Uri(factorDir + FileData.baseMultiFactorInfo[3] + ".png", UriKind.Relative));
             MultiFactor5.Source = new BitmapImage(new Uri(factorDir + FileData.baseMultiFactorInfo[4] + ".png", UriKind.Relative));
+
+            MultilineLabel.Foreground = Brushes.Red;
         }
 
         //点击基础因子(正面和多面)图片事件响应
@@ -296,6 +311,8 @@ private void Button_BaseConfirm_Click(Object sender, RoutedEventArgs e)
                 Warn.Text = Dictionary.I18n.Lang.ResourceManager.GetString("BaseMutatorsWarn");
                 return;
             }
+            NegativeLabel.Foreground = Brushes.Gray;
+            MultilineLabel.Foreground = Brushes.Gray;
             SetBaseFactorEnable(false);
             ShowRandomFactor();
             RandomCommanderInfo();
@@ -351,6 +368,8 @@ private void ShowRandomFactor()
                 SelectFactor7.Source = new BitmapImage(new Uri(factorDir + factorListClone[randNum[6]] + ".png", UriKind.Relative));
                 SelectFactor8.Source = new BitmapImage(new Uri(factorDir + factorListClone[randNum[7]] + ".png", UriKind.Relative));
             }
+
+            FreeLabel.Foreground = Brushes.Red;
         }
 
         //点击自选因子事件响应
@@ -437,6 +456,9 @@ private void RandomCommanderInfo()
             AfterCommander2.Source = new BitmapImage(new Uri(commanderDir + FileData.afterCommanderInfo[afterRandNum[1]] + ".png", UriKind.Relative));
             AfterCommander3.Source = new BitmapImage(new Uri(commanderDir + FileData.afterCommanderInfo[afterRandNum[2]] + ".png", UriKind.Relative));
             AfterCommander4.Source = new BitmapImage(new Uri(commanderDir + FileData.afterCommanderInfo[afterRandNum[3]] + ".png", UriKind.Relative));
+
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
         }
 
         //点击自选指挥官事件响应
@@ -606,9 +628,6 @@ private void clearRandomCommander()
         }
 
 
-
-
-
         //实现绑定响应接口
         private void RaisePropertyChanged(string propertyName)
         {
diff --git a/LiaoTian_Cup/Mode/HubModeWindow.xaml b/LiaoTian_Cup/Mode/HubModeWindow.xaml
index 4ed7efb..f03f1ab 100644
--- a/LiaoTian_Cup/Mode/HubModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/HubModeWindow.xaml
@@ -19,60 +19,88 @@
     </Page.Resources>
 
 
-    <Grid ShowGridLines="True">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
             <RowDefinition Height="240" />
-            <RowDefinition Height="80" />
-            <RowDefinition Height="80" />
+            <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Margin="0,10,10,0"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <ComboBox
-                x:Name="ModeBox"
-                Width="130"
-                IsEditable="False"
-                Style="{StaticResource BaseComboBox}"
-                Text="{Binding Path=modeName}">
-                <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-                <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-            </ComboBox>
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <Grid>
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="190"
+                    Margin="0,0,0,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="20,10,10,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <ComboBox
+                    x:Name="ModeBox"
+                    Width="130"
+                    IsEditable="False"
+                    Style="{StaticResource BaseComboBox}"
+                    Text="{Binding Path=modeName}">
+                    <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                    <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
                 x:Name="RandStartBtn"
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="6">
             <Button
                 Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
+
 
         <Grid Grid.Row="1">
+            <Label x:Name="MapLabel" Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="6">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource MapImg}" TargetType="Image">
@@ -84,10 +112,7 @@
                         <Setter Property="Margin" Value="5,10,0,0" />
                     </Style>
                 </StackPanel.Resources>
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
+
                 <StackPanel>
                     <Image
                         x:Name="MapImg1"
@@ -112,133 +137,190 @@
                 Content="{Binding [ConfirmMapBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
 
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="2" Grid.ColumnSpan="2">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="2*" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <Grid.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Base_MouseDown" />
-                    </Style>
-                </Grid.Resources>
 
-                <Grid
-                    Grid.Row="0"
-                    Margin="0,12,0,0"
-                    VerticalAlignment="Top">
-                    <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-
-                            <Grid Row="0">
-                                <StackPanel Orientation="Horizontal">
-                                    <Image x:Name="NegativeFactor1" Margin="0,0,0,0" />
-                                    <Image x:Name="NegativeFactor2" />
-                                    <Image x:Name="NegativeFactor3" />
-                                    <Image x:Name="NegativeFactor4" />
-                                    <Image x:Name="NegativeFactor5" />
-                                </StackPanel>
-                            </Grid>
-                            <Grid Margin="0,15,0,0" Row="1">
-                                <StackPanel Orientation="Horizontal">
-                                    <Image x:Name="NegativeFactor6" Margin="0,0,0,0" />
-                                    <Image x:Name="NegativeFactor7" />
-                                    <Image x:Name="NegativeFactor8" />
-                                    <Image x:Name="NegativeFactor9" />
-                                    <Image x:Name="NegativeFactor10" />
-                                    <Image x:Name="NegativeFactor11" />
-                                    <Image x:Name="NegativeFactor12" />
-                                    <Image x:Name="NegativeFactor13" />
-                                    <Image x:Name="NegativeFactor14" />
-                                </StackPanel>
-
-                            </Grid>
-
-                        </Grid>
-
-                    </StackPanel>
+                <Grid Grid.Row="0">
+                    <Label x:Name="NegativeLabel" Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}" />
                 </Grid>
 
                 <Grid Grid.Row="1">
-                    <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
-                        <Image x:Name="MultiFactor1" Margin="0,0,0,0" />
-                        <Image x:Name="MultiFactor2" />
-                        <Image x:Name="MultiFactor3" />
-                        <Image x:Name="MultiFactor4" />
-                        <Image x:Name="MultiFactor5" />
-                        <Image x:Name="MultiFactor6" />
-                        <Image x:Name="MultiFactor7" />
-                        <Image x:Name="MultiFactor8" />
-                        <Image x:Name="MultiFactor9" />
-                    </StackPanel>
-                    <Button
-                        x:Name="BaseConfirmBtn"
-                        Margin="0,0,20,0"
-                        Click="Button_BaseConfirm_Click"
-                        Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
-                        IsEnabled="False" />
+                    <Label x:Name="MultilineLabel" Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}" />
                 </Grid>
+            </Grid>
+        </Grid>
+        <Grid
+            Grid.Row="2"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="2*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid.Resources>
+                <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                    <EventSetter Event="MouseLeftButtonDown" Handler="Base_MouseDown" />
+                </Style>
+            </Grid.Resources>
 
+            <Grid
+                Grid.Row="0"
+                Margin="0,12,0,0"
+                VerticalAlignment="Top">
+                <StackPanel Orientation="Horizontal">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <Grid Row="0">
+                            <StackPanel Orientation="Horizontal">
+                                <Image x:Name="NegativeFactor1" Margin="0,0,0,0" />
+                                <Image x:Name="NegativeFactor2" />
+                                <Image x:Name="NegativeFactor3" />
+                                <Image x:Name="NegativeFactor4" />
+                                <Image x:Name="NegativeFactor5" />
+                            </StackPanel>
+                        </Grid>
+                        <Grid Margin="0,15,0,0" Row="1">
+                            <StackPanel Orientation="Horizontal">
+                                <Image x:Name="NegativeFactor6" Margin="0,0,0,0" />
+                                <Image x:Name="NegativeFactor7" />
+                                <Image x:Name="NegativeFactor8" />
+                                <Image x:Name="NegativeFactor9" />
+                                <Image x:Name="NegativeFactor10" />
+                                <Image x:Name="NegativeFactor11" />
+                                <Image x:Name="NegativeFactor12" />
+                                <Image x:Name="NegativeFactor13" />
+                                <Image x:Name="NegativeFactor14" />
+                            </StackPanel>
+                        </Grid>
+                    </Grid>
+                </StackPanel>
             </Grid>
+
+            <Grid Grid.Row="1">
+                <StackPanel Orientation="Horizontal">
+
+                    <Image x:Name="MultiFactor1" Margin="0,0,0,0" />
+                    <Image x:Name="MultiFactor2" />
+                    <Image x:Name="MultiFactor3" />
+                    <Image x:Name="MultiFactor4" />
+                    <Image x:Name="MultiFactor5" />
+                    <Image x:Name="MultiFactor6" />
+                    <Image x:Name="MultiFactor7" />
+                    <Image x:Name="MultiFactor8" />
+                    <Image x:Name="MultiFactor9" />
+                </StackPanel>
+            </Grid>
+        </Grid>
+        <Grid Grid.Row="2" Grid.Column="6">
+            <Button
+                x:Name="BaseConfirmBtn"
+                Margin="0,0,20,0"
+                Click="Button_BaseConfirm_Click"
+                Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
+                IsEnabled="False" />
         </Grid>
 
-        <Grid Grid.Row="3">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+        <Grid Grid.Row="3" Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
-                <Image x:Name="SelectFactor2" />
-                <Image x:Name="SelectFactor3" />
-                <Image x:Name="SelectFactor4" />
-                <Image x:Name="SelectFactor5" />
-                <Image x:Name="SelectFactor6" />
-                <Image x:Name="SelectFactor7" />
-                <Image x:Name="SelectFactor8" />
-            </StackPanel>
+            <Grid Grid.Row="0">
+                <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="4">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
-                <Image x:Name="BeforeCommander2" />
-                <Image x:Name="BeforeCommander3" />
-                <Image x:Name="BeforeCommander4" />
-                <Image x:Name="BeforeCommander5" />
-                <Image x:Name="BeforeCommander6" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                <Image x:Name="AfterCommander2" />
-                <Image x:Name="AfterCommander3" />
-                <Image x:Name="AfterCommander4" />
-            </StackPanel>
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="0">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                            <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
+                        </Style>
+                    </StackPanel.Resources>
+
+                    <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
+                    <Image x:Name="SelectFactor2" />
+                    <Image x:Name="SelectFactor3" />
+                    <Image x:Name="SelectFactor4" />
+                    <Image x:Name="SelectFactor5" />
+                    <Image x:Name="SelectFactor6" />
+                    <Image x:Name="SelectFactor7" />
+                    <Image x:Name="SelectFactor8" />
+                </StackPanel>
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                            <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                        </Style>
+                    </StackPanel.Resources>
+
+                    <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
+                    <Image x:Name="BeforeCommander2" />
+                    <Image x:Name="BeforeCommander3" />
+                    <Image x:Name="BeforeCommander4" />
+                    <Image x:Name="BeforeCommander5" />
+                    <Image x:Name="BeforeCommander6" />
+                    <Label
+                        x:Name="NewCmdrLabel"
+                        Margin="18,0,0,0"
+                        Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                    <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+                    <Image x:Name="AfterCommander2" />
+                    <Image x:Name="AfterCommander3" />
+                    <Image x:Name="AfterCommander4" />
+                </StackPanel>
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="5">
+        <Grid Grid.Row="4" Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="100" />
+                <RowDefinition Height="100" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="0">
+                <Label Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+            <Grid Grid.Row="1">
+                <Label Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+            <Grid Grid.Row="2">
+                <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="2"
+            Grid.ColumnSpan="5">
             <Grid.RowDefinitions>
                 <RowDefinition Height="100" />
                 <RowDefinition Height="100" />
@@ -254,7 +336,6 @@
                     Y1="0"
                     Y2="0" />
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image
                         x:Name="HasSelectMap"
                         Margin="10,0,0,0"
@@ -279,7 +360,6 @@
                             </Style>
                         </StackPanel.Resources>
 
-                        <Label Margin="18,0,0,0" Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="HasSelectBaseFactor1" Margin="0,0,0,0" />
                         <Image x:Name="HasSelectBaseFactor2" />
                         <Image x:Name="HasSelectBaseFactor3" />
@@ -292,13 +372,7 @@
                             </Style>
                         </StackPanel.Resources>
 
-                        <Label
-                            Margin="18,0,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            FontSize="20"
-                            FontWeight="Bold" />
+                        <Label Margin="18,0,0,0" Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
                         <Image x:Name="HasSelectFactor2" />
                         <Image x:Name="HasSelectFactor3" />
@@ -306,19 +380,15 @@
                         <Image x:Name="HasSelectFactor5" />
                     </StackPanel>
                 </StackPanel>
-
             </Grid>
 
-            <Grid Grid.Row="2" />
-
-            <Grid Grid.Row="3">
+            <Grid Grid.Row="2">
                 <StackPanel Orientation="Horizontal">
                     <StackPanel.Resources>
                         <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                             <EventSetter Event="MouseLeftButtonDown" Handler="CancelCommander_MouseDown" />
                         </Style>
                     </StackPanel.Resources>
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="HasSelectCommander1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectCommander2" />
                     <TextBlock
@@ -336,5 +406,43 @@
                     Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
             </Grid>
         </Grid>
+        <Grid
+            Grid.Row="4"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="6"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs b/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs
index c56abe9..a48611f 100644
--- a/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/HubModeWindow.xaml.cs
@@ -3,18 +3,11 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Force.DeepCloner;
 
 namespace LiaoTian_Cup.Mode
@@ -126,6 +119,13 @@ public void ResetFunc()
             hasSelectMap = new Image();
             ClearRandomMaps();
             FlashHasSelectMap();
+
+            MapLabel.Foreground = Brushes.Black;
+            NegativeLabel.Foreground = Brushes.Black;
+            MultilineLabel.Foreground = Brushes.Black;
+            FreeLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
         //开始随机事件响应
@@ -164,6 +164,7 @@ private void ShowRandomMaps()
             MapName1.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[0]]);
             MapName2.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[1]]);
             MapName3.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[2]]);
+            MapLabel.Foreground = Brushes.Red;
         }
 
         //点击地图图片事件响应
@@ -218,6 +219,7 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
                 Warn.Text = Dictionary.I18n.Lang.ResourceManager.GetString("MapWarn");
                 return;
             }
+            MapLabel.Foreground = Brushes.Gray;
             SetRandMapEnable(false);
             ShowBaseNegativeFactor();
             ShowBaseMultiFactor();
@@ -227,6 +229,7 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
         //正面因子显示
         private void ShowBaseNegativeFactor()
         {
+            NegativeLabel.Foreground = Brushes.Red;
             //相对路径URI指定因子图片来源
             NegativeFactor1.Source = new BitmapImage(new Uri(factorDir + FileData.hubNegativeFactorInfo[0] + ".png", UriKind.Relative));
             NegativeFactor2.Source = new BitmapImage(new Uri(factorDir + FileData.hubNegativeFactorInfo[1] + ".png", UriKind.Relative));
@@ -247,6 +250,7 @@ private void ShowBaseNegativeFactor()
         //多线因子显示
         private void ShowBaseMultiFactor()
         {
+            MultilineLabel.Foreground = Brushes.Red;
             MultiFactor1.Source = new BitmapImage(new Uri(factorDir + FileData.hubMultiFactorInfo[0] + ".png", UriKind.Relative));
             MultiFactor2.Source = new BitmapImage(new Uri(factorDir + FileData.hubMultiFactorInfo[1] + ".png", UriKind.Relative));
             MultiFactor3.Source = new BitmapImage(new Uri(factorDir + FileData.hubMultiFactorInfo[2] + ".png", UriKind.Relative));
@@ -317,9 +321,15 @@ private void Button_BaseConfirm_Click(Object sender, RoutedEventArgs e)
                 Warn.Text = Dictionary.I18n.Lang.ResourceManager.GetString("BaseMutatorsWarn");
                 return;
             }
+            NegativeLabel.Foreground = Brushes.Gray;
+            MultilineLabel.Foreground = Brushes.Gray;
+
             SetBaseFactorEnable(false);
             ShowRandomFactor();
             RandomCommanderInfo();
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
+            FreeLabel.Foreground = Brushes.Red;
         }
 
         //刷新已选基础因子事件
diff --git a/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml b/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml
index df98520..ad06a81 100644
--- a/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml
+++ b/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml
@@ -17,7 +17,7 @@
         <Style BasedOn="{StaticResource BaseTextBox}" TargetType="TextBox" />
     </Page.Resources>
 
-    <Grid ShowGridLines="True">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="80" />
             <RowDefinition Height="140" />
@@ -26,52 +26,80 @@
             <RowDefinition Height="120" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Margin="0,10,10,0"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <ComboBox
-                x:Name="ModeBox"
-                Width="130"
-                IsEditable="False"
-                Style="{StaticResource BaseComboBox}"
-                Text="{Binding Path=modeName}">
-                <ComboBoxItem Content="{Binding [ThreeMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-                <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-            </ComboBox>
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <Grid>
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="190"
+                    Margin="0,0,0,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="20,10,10,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <ComboBox
+                    x:Name="ModeBox"
+                    Width="130"
+                    IsEditable="False"
+                    Style="{StaticResource BaseComboBox}"
+                    Text="{Binding Path=modeName}">
+                    <ComboBoxItem Content="{Binding [ThreeMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                    <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="3">
             <Button
                 x:Name="RandStartBtn"
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
                 Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
 
 
         <Grid Grid.Row="1">
+            <Label x:Name="MapLabel" Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="5">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource MapImg}" TargetType="Image">
@@ -84,41 +112,45 @@
                     </Style>
                 </StackPanel.Resources>
 
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
                 <StackPanel>
-                    <Image x:Name="MapImg1" Margin="0,10,0,0" />
+                    <Image
+                        x:Name="MapImg1"
+                        Margin="0,10,0,0"
+                        RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName1" Margin="0,10,0,0" />
                 </StackPanel>
                 <StackPanel>
-                    <Image x:Name="MapImg2" />
+                    <Image x:Name="MapImg2" RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName2" />
                 </StackPanel>
                 <StackPanel>
-                    <Image x:Name="MapImg3" />
+                    <Image x:Name="MapImg3" RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName3" />
                 </StackPanel>
             </StackPanel>
             <Button
                 x:Name="MapConfirmBtn"
                 Margin="0,0,20,0"
+                HorizontalAlignment="Right"
                 Click="Button_MapConfirm_Click"
                 Content="{Binding [ConfirmMapBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
 
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="2" Grid.ColumnSpan="2">
+            <Label x:Name="BaseLabel" Content="{Binding [BaseMutator], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="2"
+            Grid.ColumnSpan="2">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                         <EventSetter Event="MouseLeftButtonDown" Handler="Base_MouseDown" />
                     </Style>
                 </StackPanel.Resources>
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [BaseMutator], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
+
                 <Image x:Name="Factor1" Margin="0,0,0,0" />
                 <Image x:Name="Factor2" />
                 <Image x:Name="Factor3" />
@@ -126,23 +158,32 @@
                 <Image x:Name="Factor5" />
                 <Image x:Name="Factor6" />
             </StackPanel>
+        </Grid>
+
+        <Grid Grid.Row="2" Grid.Column="5">
             <Button
                 x:Name="BaseConfirmBtn"
                 Margin="0,0,20,0"
-                HorizontalAlignment="Right"
                 Click="Button_BaseConfirm_Click"
                 Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
                 IsEnabled="False" />
         </Grid>
 
-        <Grid Grid.Row="3">
+        <Grid Grid.Row="3" Grid.ColumnSpan="2">
+            <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="3">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                         <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
                     </Style>
                 </StackPanel.Resources>
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+
                 <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
                 <Image x:Name="SelectFactor2" />
                 <Image x:Name="SelectFactor3" />
@@ -154,7 +195,11 @@
             </StackPanel>
         </Grid>
 
-        <Grid Grid.Row="4">
+        <Grid Grid.Row="4" Grid.ColumnSpan="2">
+            <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Row="4" Grid.Column="2">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
@@ -162,27 +207,79 @@
                     </Style>
                 </StackPanel.Resources>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
                 <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
                 <Image x:Name="BeforeCommander2" />
                 <Image x:Name="BeforeCommander3" />
                 <Image x:Name="BeforeCommander4" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+            </StackPanel>
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="2"
+            Grid.ColumnSpan="2">
+            <Label
+                x:Name="NewCmdrLabel"
+                Margin="0,0,50,0"
+                HorizontalAlignment="Right"
+                HorizontalContentAlignment="Right"
+                Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+        <Grid
+            Grid.Row="4"
+            Grid.Column="3"
+            Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <StackPanel.Resources>
+                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                    </Style>
+                </StackPanel.Resources>
+
+                <Image x:Name="AfterCommander1" Margin="150,0,0,0" />
                 <Image x:Name="AfterCommander2" />
                 <Image x:Name="AfterCommander3" />
                 <Image x:Name="AfterCommander4" />
             </StackPanel>
         </Grid>
 
-        <Grid Grid.Row="5">
-            <StackPanel>
+        <Grid Grid.Row="5" Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="0">
+                <Label Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <Label Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="2">
+                <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="5"
+            Grid.Column="2"
+            Grid.ColumnSpan="3">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Grid Grid.ColumnSpan="2">
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
-                    <Image
-                        x:Name="HasSelectMap"
-                        Margin="10,15,0,0"
-                        Style="{StaticResource MapImg}" />
+                    <Image x:Name="HasSelectMap" Style="{StaticResource MapImg}" />
                     <TextBlock
                         x:Name="MapTip"
                         Margin="50,10,0,0"
@@ -192,30 +289,46 @@
                         Foreground="Red"
                         Text="" />
                 </StackPanel>
-                <StackPanel Margin="0,30,0,0" Orientation="Horizontal">
+            </Grid>
+
+            <Grid Grid.Row="1" Grid.ColumnSpan="2">
+                <StackPanel Orientation="Horizontal">
                     <StackPanel.Resources>
                         <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image" />
                     </StackPanel.Resources>
 
-                    <!--  此处单独处理事件Handler  -->
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image
                         x:Name="HasSelectBaseFactor1"
                         Margin="0,0,0,0"
                         MouseLeftButtonDown="CancelBase_MouseDown" />
                     <Image x:Name="HasSelectBaseFactor2" MouseLeftButtonDown="CancelBase_MouseDown" />
-                    <Label Margin="30,0,0,0" Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </StackPanel>
+                <Label
+                    Margin="0,0,50,0"
+                    HorizontalAlignment="Right"
+                    HorizontalContentAlignment="Right"
+                    Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid
+                Grid.Row="1"
+                Grid.Column="1"
+                Grid.ColumnSpan="2">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image" />
+                    </StackPanel.Resources>
+
                     <Image
                         x:Name="HasSelectFactor1"
-                        Margin="0,0,0,0"
+                        Margin="150,0,0,0"
                         MouseLeftButtonDown="CancelFactor_MouseDown" />
                     <Image x:Name="HasSelectFactor2" MouseLeftButtonDown="CancelFactor_MouseDown" />
                     <Image x:Name="HasSelectFactor3" MouseLeftButtonDown="CancelFactor_MouseDown" />
                 </StackPanel>
-
-
-                <StackPanel Margin="0,30,0,0" Orientation="Horizontal">
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+            <Grid Grid.Row="2" Grid.ColumnSpan="3">
+                <StackPanel Orientation="Horizontal">
                     <Image
                         x:Name="HasSelectCommander"
                         Margin="0,0,0,0"
@@ -230,8 +343,10 @@
                         Foreground="Red"
                         Text="" />
                 </StackPanel>
+            </Grid>
+        </Grid>
 
-            </StackPanel>
+        <Grid Grid.Row="5" Grid.Column="5">
             <Button
                 Margin="0,0,20,30"
                 HorizontalAlignment="Right"
@@ -239,5 +354,44 @@
                 Click="Button_Confirm_Click"
                 Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
+
+        <Grid
+            Grid.Row="5"
+            Grid.Column="0"
+            Grid.ColumnSpan="6">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="5"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="6">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="6">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs b/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs
index 1950677..6e19e3f 100644
--- a/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/NegativeFactorWindow.xaml.cs
@@ -6,6 +6,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace LiaoTian_Cup
@@ -85,10 +86,10 @@ private void RandomCommanderInfo()
             BeforeCommander3.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[beforeRandNum[2]]}.png", UriKind.Relative));
             BeforeCommander4.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[beforeRandNum[3]]}.png", UriKind.Relative));
 
-            AfterCommander1.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[afterRandNum[0]]}.png", UriKind.Relative));
-            AfterCommander2.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[afterRandNum[1]]}.png", UriKind.Relative));
-            AfterCommander3.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[afterRandNum[2]]}.png", UriKind.Relative));
-            AfterCommander4.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.beforeCommanderInfo[afterRandNum[3]]}.png", UriKind.Relative));
+            AfterCommander1.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.afterCommanderInfo[afterRandNum[0]]}.png", UriKind.Relative));
+            AfterCommander2.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.afterCommanderInfo[afterRandNum[1]]}.png", UriKind.Relative));
+            AfterCommander3.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.afterCommanderInfo[afterRandNum[2]]}.png", UriKind.Relative));
+            AfterCommander4.Source = new BitmapImage(new Uri($"{commanderDir}{FileData.afterCommanderInfo[afterRandNum[3]]}.png", UriKind.Relative));
         }
 
         //随机先出和后出指挥官清除显示
@@ -133,6 +134,8 @@ private void ShowRandomMaps()
             MapName1.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[0]]);
             MapName2.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[1]]);
             MapName3.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[2]]);
+
+            MapLabel.Foreground = Brushes.Red;
         }
 
         //随机地图显示清除
@@ -167,6 +170,7 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
                 MapTip.Text = Dictionary.I18n.Lang.ResourceManager.GetString("MapWarn");
                 return;
             }
+            MapLabel.Foreground = Brushes.Gray;
             SetRandMapEnable(false);
             ShowBaseFactor();
         }
@@ -230,6 +234,7 @@ private void SetRandMapEnable(bool enable)
         //基础因子显示
         private void ShowBaseFactor()
         {
+            BaseLabel.Foreground = Brushes.Red;
             //相对路径URI指定因子图片来源
             Factor1.Source = new BitmapImage(new Uri(factorDir + FileData.baseNegativeFactorInfo[0] + ".png", UriKind.Relative));
             Factor2.Source = new BitmapImage(new Uri(factorDir + FileData.baseNegativeFactorInfo[1] + ".png", UriKind.Relative));
@@ -296,6 +301,7 @@ private void CancelBase_MouseDown(Object sender, RoutedEventArgs e)
             FlashSelectBase();
         }
 
+        // 基础因子确认按钮
         private void Button_BaseConfirm_Click(Object sender, RoutedEventArgs e)
         {
             Warn.Text = "";
@@ -309,9 +315,15 @@ private void Button_BaseConfirm_Click(Object sender, RoutedEventArgs e)
                 Warn.Text = Dictionary.I18n.Lang.ResourceManager.GetString("BaseMutatorsWarn");
                 return;
             }
+            MapLabel.Foreground = Brushes.Gray;
             SetBaseFactorEnable(false);
             ShowRandomFactor();
             RandomCommanderInfo();
+
+            BaseLabel.Foreground = Brushes.Gray;
+            FreeLabel.Foreground = Brushes.Red;
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
         }
 
         //刷新已选基础因子事件
@@ -532,6 +544,12 @@ public void ResetFunc()
             hasSelectMap = new Image();
             ClearRandomMaps();
             FlashHasSelectMap();
+
+            MapLabel.Foreground = Brushes.Black;
+            FreeLabel.Foreground = Brushes.Black;
+            BaseLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
         //实现绑定响应接口
diff --git a/LiaoTian_Cup/Mode/RandomMutationWindow.xaml b/LiaoTian_Cup/Mode/RandomMutationWindow.xaml
index a050e55..77a0108 100644
--- a/LiaoTian_Cup/Mode/RandomMutationWindow.xaml
+++ b/LiaoTian_Cup/Mode/RandomMutationWindow.xaml
@@ -20,7 +20,7 @@
         <Style BasedOn="{StaticResource BaseTextBox}" TargetType="TextBox" />
     </Page.Resources>
 
-    <Grid ShowGridLines="True">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="80" />
             <RowDefinition Height="100" />
@@ -29,72 +29,130 @@
             <RowDefinition Height="120" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <CheckBox
-                x:Name="ChkDoubles"
-                Content="{Binding [DoublesMode], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isDoubles, Mode=TwoWay}" />
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <Grid Grid.Column="0">
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="230"
+                    Margin="0,0,10,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="0,10,0,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <CheckBox
+                    x:Name="ChkDoubles"
+                    Margin="0,10,0,0"
+                    Content="{Binding [DoublesMode], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isDoubles, Mode=TwoWay}" />
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="3">
             <Button
-                Margin="10,0,35,0"
+                x:Name="RandStartBtn"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
-                Margin="0,0,35,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
-                Margin="0,0,35,0"
+                Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="2">
+            <Label Content="{Binding [MutationName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
 
+        <Grid Grid.Row="1" Grid.Column="2">
+            <TextBox
+                x:Name="MutationBox"
+                Width="360"
+                HorizontalAlignment="Left"
+                TextWrapping="Wrap" />
+        </Grid>
 
+        <Grid Grid.Row="1" Grid.Column="3">
+            <Label Content="{Binding [MapName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
 
-        <Grid Grid.Row="1">
-            <StackPanel Orientation="Horizontal">
-                <Label Margin="30,0,0,0" Content="{Binding [MutationName], Source={x:Static local:LanguageManager.Instance}}" />
-                <TextBox
-                    x:Name="MutationBox"
-                    Width="367"
-                    TextWrapping="Wrap" />
-                <Label Margin="50,0,0,0" Content="{Binding [MapName], Source={x:Static local:LanguageManager.Instance}}" />
-                <TextBox x:Name="MapBox" Width="217" />
-            </StackPanel>
+        <Grid
+            Grid.Row="1"
+            Grid.Column="4"
+            Grid.ColumnSpan="2">
+            <TextBox
+                x:Name="MapBox"
+                Width="240"
+                HorizontalAlignment="Left" />
         </Grid>
 
-        <Grid Grid.Row="2">
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="2">
+            <Label Content="{Binding [BaseMutator], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Row="2" Grid.Column="2">
             <StackPanel Orientation="Horizontal">
-                <Label Margin="30,0,0,0" Content="{Binding [BaseMutator], Source={x:Static local:LanguageManager.Instance}}" />
                 <Image x:Name="Factor1" Margin="0,0,0,0" />
                 <Image x:Name="Factor2" />
                 <Image x:Name="Factor3" />
-                <Image
-                    x:Name="MapImg"
-                    Margin="115,0,0,0"
-                    RenderTransformOrigin="0.5,0.5"
-                    Style="{StaticResource MapImg}" />
             </StackPanel>
         </Grid>
 
-        <Grid Grid.Row="3">
+        <Grid
+            Grid.Row="2"
+            Grid.Column="3"
+            Grid.ColumnSpan="3">
+            <Image
+                x:Name="MapImg"
+                Margin="0,0,90,0"
+                RenderTransformOrigin="0.5,0.5"
+                Style="{StaticResource MapImg}" />
+        </Grid>
+
+        <Grid Grid.Row="3" Grid.ColumnSpan="2">
+            <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="3">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
@@ -102,7 +160,6 @@
                     </Style>
                 </StackPanel.Resources>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
                 <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
                 <Image x:Name="SelectFactor2" />
                 <Image x:Name="SelectFactor3" />
@@ -113,36 +170,99 @@
                 <Image x:Name="SelectFactor8" />
             </StackPanel>
         </Grid>
-        <Grid Grid.Row="4">
+
+        <Grid Grid.Row="4" Grid.ColumnSpan="2">
+            <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Row="4" Grid.Column="2">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                         <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
                     </Style>
                 </StackPanel.Resources>
-
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
                 <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
                 <Image x:Name="BeforeCommander2" />
                 <Image x:Name="BeforeCommander3" />
                 <Image x:Name="BeforeCommander4" />
                 <Image x:Name="BeforeCommander5" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+            </StackPanel>
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="3"
+            Grid.ColumnSpan="2">
+            <Label
+                x:Name="NewCmdrLabel"
+                HorizontalAlignment="Left"
+                Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="4"
+            Grid.ColumnSpan="2">
+            <StackPanel Orientation="Horizontal">
+                <StackPanel.Resources>
+                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                    </Style>
+                </StackPanel.Resources>
+                <Image x:Name="AfterCommander1" Margin="40,0,0,0" />
                 <Image x:Name="AfterCommander2" />
                 <Image x:Name="AfterCommander3" />
             </StackPanel>
         </Grid>
-        <Grid Grid.Row="5">
-            <StackPanel>
-                <StackPanel Margin="0,18,0,0" Orientation="Horizontal">
+
+        <Grid Grid.Row="5" Grid.ColumnSpan="7">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="240" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Grid Row="0">
+                <Label Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Row="1">
+                <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid ColumnSpan="2" Row="2">
+                <Label
+                    Margin="30,0,0,30"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="bottom"
+                    Content="{Binding [RandomMutationTip], Source={x:Static local:LanguageManager.Instance}}"
+                    FontSize="16" />
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="5"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="0">
+                <StackPanel Orientation="Horizontal">
                     <StackPanel.Resources>
                         <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                             <EventSetter Event="MouseLeftButtonDown" Handler="CancelFactor_MouseDown" />
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectFactor2" />
                     <Image x:Name="HasSelectFactor3" />
@@ -152,16 +272,16 @@
                     <Image x:Name="HasSelectFactor7" />
                     <Image x:Name="HasSelectFactor8" />
                 </StackPanel>
+            </Grid>
 
-
-                <StackPanel Margin="0,58,0,0" Orientation="Horizontal">
+            <Grid Grid.Row="1">
+                <StackPanel Orientation="Horizontal">
                     <StackPanel.Resources>
                         <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                             <EventSetter Event="MouseLeftButtonDown" Handler="CancelCommander_MouseDown" />
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="HasSelectCommander1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectCommander2" />
                     <TextBlock
@@ -173,19 +293,41 @@
                         Foreground="Red"
                         Text="" />
                 </StackPanel>
-            </StackPanel>
+            </Grid>
+        </Grid>
 
-            <Label
-                Margin="18,0,0,30"
-                VerticalAlignment="bottom"
-                Content="{Binding [RandomMutationTip], Source={x:Static local:LanguageManager.Instance}}"
-                FontSize="16" />
+        <Grid Grid.Row="5" Grid.Column="5">
             <Button
-                Margin="0,0,33,28"
-                HorizontalAlignment="Right"
+                Margin="0,0,20,28"
                 VerticalAlignment="Bottom"
                 Click="Button_Confirm_Click"
                 Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="5"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="6"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/RandomMutationWindow.xaml.cs b/LiaoTian_Cup/Mode/RandomMutationWindow.xaml.cs
index da713c0..3704bff 100644
--- a/LiaoTian_Cup/Mode/RandomMutationWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/RandomMutationWindow.xaml.cs
@@ -5,6 +5,7 @@
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace LiaoTian_Cup
@@ -90,6 +91,9 @@ private void RandomMutationFunc()
             Random8Factor(randMutationInfo);
             //随机先出和后出指挥官
             RandomCommanderInfo();
+            FreeLabel.Foreground = Brushes.Red;
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
         }
 
         //随机8因子选择处理逻辑
@@ -137,7 +141,6 @@ private void RandomCommanderInfo()
         }
 
         
-        
         //是否随机AI的处理逻辑
         private string IsRandAIFunc()
         {
@@ -151,7 +154,6 @@ private string IsRandAIFunc()
         }
 
         
-
         //开始随机事件响应
         private void Button_Random_Click(object sender, RoutedEventArgs e)
         {
@@ -341,6 +343,10 @@ public void ResetFunc()
             AfterCommander1.Source = new BitmapImage();
             AfterCommander2.Source = new BitmapImage();
             AfterCommander3.Source = new BitmapImage();
+
+            FreeLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
         //实现绑定响应接口
diff --git a/LiaoTian_Cup/Mode/SingleModeWindow.xaml b/LiaoTian_Cup/Mode/SingleModeWindow.xaml
index e65a9cc..aa4bd19 100644
--- a/LiaoTian_Cup/Mode/SingleModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/SingleModeWindow.xaml
@@ -6,7 +6,7 @@
     xmlns:local="clr-namespace:LiaoTian_Cup.Dictionary.I18n"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="1180"
-    Height="910"
+    Height="880"
     Background="#ACFFFFFF"
     mc:Ignorable="d">
 
@@ -17,57 +17,85 @@
         <Style BasedOn="{StaticResource BaseTextBox}" TargetType="TextBox" />
     </Page.Resources>
 
-    <Grid ShowGridLines="True">
-
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="80" />
             <RowDefinition Height="150" />
             <RowDefinition Height="220" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Margin="0,10,10,0"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <ComboBox
-                x:Name="ModeBox"
-                Width="130"
-                IsEditable="False"
-                Style="{StaticResource BaseComboBox}"
-                Text="{Binding Path=modeName}">
-                <ComboBoxItem Content="{Binding [ThreeMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-                <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-            </ComboBox>
+        <Grid>
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="190"
+                    Margin="0,0,0,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="20,10,10,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <ComboBox
+                    x:Name="ModeBox"
+                    Width="130"
+                    IsEditable="False"
+                    Style="{StaticResource BaseComboBox}"
+                    Text="{Binding Path=modeName}">
+                    <ComboBoxItem Content="{Binding [ThreeMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                    <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="3">
             <Button
                 x:Name="RandStartBtn"
-                Margin="55,0,35,0"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
-                Margin="0,0,35,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
-                Margin="0,0,35,0"
+                Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
 
         <Grid Grid.Row="1">
+            <Label x:Name="MapLabel" Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="5">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource MapImg}" TargetType="Image">
@@ -80,38 +108,65 @@
                     </Style>
                 </StackPanel.Resources>
 
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
                 <StackPanel>
-                    <Image x:Name="MapImg1" Margin="0,10,0,0" />
+                    <Image
+                        x:Name="MapImg1"
+                        Margin="0,10,0,0"
+                        RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName1" Margin="0,10,0,0" />
                 </StackPanel>
                 <StackPanel>
-                    <Image x:Name="MapImg2" />
+                    <Image x:Name="MapImg2" RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName2" />
                 </StackPanel>
                 <StackPanel>
-                    <Image x:Name="MapImg3" />
+                    <Image x:Name="MapImg3" RenderTransformOrigin="0.5,0.5" />
                     <TextBlock x:Name="MapName3" />
                 </StackPanel>
             </StackPanel>
             <Button
                 x:Name="MapConfirmBtn"
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 HorizontalAlignment="Right"
                 Click="Button_MapConfirm_Click"
                 Content="{Binding [ConfirmMapBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
-        <Grid Grid.Row="2">
+
+        <Grid Grid.Row="2" Grid.ColumnSpan="2">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <Grid Row="0">
+                    <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Grid.Row="1">
+                    <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
+
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="80" />
+                    <RowDefinition Height="*" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-                <Grid Grid.Row="0">
+                <Grid Grid.Row="0" Grid.ColumnSpan="3">
                     <StackPanel Orientation="Horizontal">
                         <StackPanel.Resources>
                             <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
@@ -119,7 +174,6 @@
                                 <EventSetter Event="MouseRightButtonDown" Handler="Ban_MouseDown" />
                             </Style>
                         </StackPanel.Resources>
-                        <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
                         <Image x:Name="SelectFactor2" />
                         <Image x:Name="SelectFactor3" />
@@ -133,6 +187,21 @@
                     </StackPanel>
                 </Grid>
 
+                <Grid
+                    Grid.Row="0"
+                    Grid.Column="2"
+                    Grid.ColumnSpan="2">
+                    <TextBlock
+                        Margin="0,0,20,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        FontSize="20"
+                        FontWeight="Bold"
+                        Foreground="Red"
+                        Text="{Binding [BanTip], Source={x:Static local:LanguageManager.Instance}}"
+                        TextAlignment="Right" />
+                </Grid>
+
                 <Grid Grid.Row="1">
                     <StackPanel Orientation="Horizontal">
                         <StackPanel.Resources>
@@ -141,49 +210,85 @@
                             </Style>
                         </StackPanel.Resources>
 
-                        <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
                         <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
                         <Image x:Name="BeforeCommander2" />
                         <Image x:Name="BeforeCommander3" />
                         <Image x:Name="BeforeCommander4" />
-                        <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                        <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                        <Image x:Name="AfterCommander2" />
                     </StackPanel>
-                    <TextBlock
-                        Margin="0,0,30,0"
+                </Grid>
+
+                <Grid ColumnSpan="2" Row="1">
+                    <Label
+                        x:Name="NewCmdrLabel"
+                        Margin="18,0,0,0"
                         HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        FontSize="20"
-                        FontWeight="Bold"
-                        Foreground="Red"
-                        Text="{Binding [BanTip], Source={x:Static local:LanguageManager.Instance}}" />
+                        HorizontalContentAlignment="Right"
+                        Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Grid.Row="1" Grid.Column="2">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
+
+                        <Image x:Name="AfterCommander1" Margin="36,0,0,0" />
+                        <Image x:Name="AfterCommander2" />
+                    </StackPanel>
                 </Grid>
             </Grid>
         </Grid>
 
-        <Grid Grid.Row="3">
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid>
+                <Label Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <Label Content="{Binding [HasBanMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="2">
+                <Label Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+
+            <Grid Grid.Row="3">
+                <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
             <Grid.RowDefinitions>
-                <RowDefinition Height="120" />
-                <RowDefinition Height="80" />
-                <RowDefinition Height="100" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
 
-            <Grid Grid.Row="0">
-                <Line
-                    Stroke="Gray"
-                    StrokeThickness="6"
-                    X1="0"
-                    X2="1180"
-                    Y1="0"
-                    Y2="0" />
+            <Grid Grid.Row="0" Grid.ColumnSpan="2">
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
-                    <Image
-                        x:Name="HasSelectMap"
-                        Margin="10,0,0,0"
-                        Style="{StaticResource MapImg}" />
+                    <Image x:Name="HasSelectMap" Style="{StaticResource MapImg}" />
                     <TextBlock
                         x:Name="MapTip"
                         Margin="50,0,0,0"
@@ -203,7 +308,6 @@
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="18,0,0,0" Content="{Binding [HasBanMutators], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="HasSelectBanFactor1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectBanFactor2" />
                     <Image x:Name="HasSelectBanFactor3" />
@@ -228,14 +332,21 @@
                         </Style>
                     </StackPanel.Resources>
 
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}" />
                     <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectFactor2" />
                     <Image x:Name="HasSelectFactor3" />
                     <Image x:Name="HasSelectFactor4" />
                     <Image x:Name="HasSelectFactor5" />
+                </StackPanel>
+            </Grid>
+
+            <Grid
+                Grid.Row="2"
+                Grid.Column="2"
+                Grid.ColumnSpan="2">
+                <StackPanel Orientation="Horizontal">
                     <TextBlock
-                        Margin="10,0,0,0"
+                        Margin="20,0,0,0"
                         VerticalAlignment="Center"
                         FontSize="20"
                         FontWeight="Bold"
@@ -251,21 +362,46 @@
                 </StackPanel>
             </Grid>
 
-
             <Grid Grid.Row="3">
-                <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
-                    <Image
-                        x:Name="HasSelectCommander"
-                        Margin="0,0,0,0"
-                        MouseLeftButtonDown="CancelCommander_MouseDown"
-                        Style="{StaticResource ClickableImg}" />
-                </StackPanel>
+                <Image
+                    x:Name="HasSelectCommander"
+                    Margin="0,0,0,0"
+                    MouseLeftButtonDown="CancelCommander_MouseDown"
+                    Style="{StaticResource ClickableImg}" />
+            </Grid>
+
+            <Grid Grid.Row="3" Grid.Column="3">
                 <Button
-                    Margin="0,0,30,0"
+                    Margin="0,10,20,0"
                     Click="Button_Confirm_Click"
                     Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
             </Grid>
         </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="6">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="6"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="6">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/SingleModeWindow.xaml.cs b/LiaoTian_Cup/Mode/SingleModeWindow.xaml.cs
index e650c28..dcf608e 100644
--- a/LiaoTian_Cup/Mode/SingleModeWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/SingleModeWindow.xaml.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace LiaoTian_Cup
@@ -129,6 +130,11 @@ public void ResetFunc()
             hasSelectMap = new Image();
             ClearRandomMaps();
             FlashHasSelectMap();
+
+            MapLabel.Foreground = Brushes.Black;
+            FreeLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
 
@@ -169,6 +175,7 @@ private void ShowRandomMaps()
             MapName1.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[0]]);
             MapName2.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[1]]);
             MapName3.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[2]]);
+            MapLabel.Foreground = Brushes.Red;
         }
 
         //点击地图图片事件响应
@@ -226,6 +233,11 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
             SetRandMapEnable(false);
             ShowRandomFactor();
             RandomCommanderInfo();
+
+            MapLabel.Foreground = Brushes.Gray;
+            FreeLabel.Foreground = Brushes.Red;
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
         }
 
         //显示最多10个随机选择因子
diff --git a/LiaoTian_Cup/Mode/USuckModeWindow.xaml b/LiaoTian_Cup/Mode/USuckModeWindow.xaml
index 65d386a..cfb4d04 100644
--- a/LiaoTian_Cup/Mode/USuckModeWindow.xaml
+++ b/LiaoTian_Cup/Mode/USuckModeWindow.xaml
@@ -6,7 +6,7 @@
     xmlns:local="clr-namespace:LiaoTian_Cup.Dictionary.I18n"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="1180"
-    Height="890"
+    Height="880"
     Background="#ACFFFFFF"
     mc:Ignorable="d">
 
@@ -18,60 +18,86 @@
     </Page.Resources>
 
 
-    <Grid ShowGridLines="True">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="60" />
             <RowDefinition Height="140" />
             <RowDefinition Height="240" />
-            <RowDefinition Height="80" />
-            <RowDefinition Height="80" />
+            <RowDefinition Height="160" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="120" />
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
         <Grid.Resources>
             <Style BasedOn="{StaticResource GridMinImage}" TargetType="Image" />
         </Grid.Resources>
 
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="30,0,0,0" Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
-            <TextBox
-                x:Name="PlayerName"
-                Width="230"
-                Margin="0,0,35,0"
-                Focusable="True"
-                Text="{Binding Path=playName}" />
-            <CheckBox
-                x:Name="ChkRandAI"
-                Margin="0,10,10,0"
-                Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
-                IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
-            <ComboBox
-                x:Name="ModeBox"
-                Width="130"
-                IsEditable="False"
-                Style="{StaticResource BaseComboBox}"
-                Text="{Binding Path=modeName}">
-                <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-                <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
-            </ComboBox>
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+        <Grid>
+            <Label Content="{Binding [PlayerName], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    x:Name="PlayerName"
+                    Width="190"
+                    Margin="0,0,0,0"
+                    Focusable="True"
+                    Text="{Binding Path=playName}" />
+                <CheckBox
+                    x:Name="ChkRandAI"
+                    Margin="20,10,10,0"
+                    Content="{Binding [RandomBot], Source={x:Static local:LanguageManager.Instance}}"
+                    IsChecked="{Binding Path=isRandAI, Mode=TwoWay}" />
+                <ComboBox
+                    x:Name="ModeBox"
+                    Width="130"
+                    IsEditable="False"
+                    Style="{StaticResource BaseComboBox}"
+                    Text="{Binding Path=modeName}">
+                    <ComboBoxItem Content="{Binding [FiveMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                    <ComboBoxItem Content="{Binding [EightMutatorsMode], Source={x:Static local:LanguageManager.Instance}}" />
+                </ComboBox>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Column="3">
             <Button
                 x:Name="RandStartBtn"
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Random_Click"
                 Content="{Binding [RandomStartBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="4">
             <Button
-                Margin="0,0,30,0"
+                Margin="0,0,20,0"
                 Click="Button_Reset_Click"
                 Content="{Binding [ResetBtn], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid Grid.Column="5">
             <Button
                 Margin="0,0,20,0"
                 Click="Button_BackMain_Click"
                 Content="{Binding [BackMenuBtn], Source={x:Static local:LanguageManager.Instance}}" />
-        </StackPanel>
+        </Grid>
 
         <Grid Grid.Row="1">
+            <Label x:Name="MapLabel" Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}" />
+        </Grid>
+
+        <Grid
+            Grid.Row="1"
+            Grid.Column="1"
+            Grid.ColumnSpan="6">
             <StackPanel Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style BasedOn="{StaticResource MapImg}" TargetType="Image">
@@ -83,10 +109,7 @@
                         <Setter Property="Margin" Value="5,10,0,0" />
                     </Style>
                 </StackPanel.Resources>
-                <Label
-                    Margin="30,0,0,0"
-                    Content="{Binding [RandMap], Source={x:Static local:LanguageManager.Instance}}"
-                    Foreground="Red" />
+
                 <StackPanel>
                     <Image
                         x:Name="MapImg1"
@@ -111,12 +134,37 @@
                 Content="{Binding [ConfirmMapBtn], Source={x:Static local:LanguageManager.Instance}}" />
         </Grid>
 
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="2" Grid.ColumnSpan="2">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="2*" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
+                <Grid Row="0">
+                    <Label x:Name="NegativeLabel" Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Row="1">
+                    <Label x:Name="MultilineLabel" Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+            </Grid>
+        </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="2"
+            ColumnSpan="4">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="2*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
                 <Grid.Resources>
                     <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                         <EventSetter Event="MouseLeftButtonDown" Handler="Base_MouseDown" />
@@ -125,13 +173,10 @@
 
                 <Grid
                     Grid.Row="0"
+                    Grid.ColumnSpan="3"
                     Margin="0,12,0,0"
                     VerticalAlignment="Top">
                     <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [NegativeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="*" />
@@ -159,20 +204,13 @@
                                     <Image x:Name="NegativeFactor13" />
                                     <Image x:Name="NegativeFactor14" />
                                 </StackPanel>
-
                             </Grid>
-
                         </Grid>
-
                     </StackPanel>
                 </Grid>
 
-                <Grid Grid.Row="1">
+                <Grid Grid.Row="1" Grid.ColumnSpan="2">
                     <StackPanel Orientation="Horizontal">
-                        <Label
-                            Margin="30,0,0,0"
-                            Content="{Binding [MultilineMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            Foreground="Red" />
                         <Image x:Name="MultiFactor1" Margin="0,0,0,0" />
                         <Image x:Name="MultiFactor2" />
                         <Image x:Name="MultiFactor3" />
@@ -181,6 +219,9 @@
                         <Image x:Name="MultiFactor6" />
                         <Image x:Name="MultiFactor7" />
                     </StackPanel>
+                </Grid>
+
+                <Grid Grid.Row="1" Grid.Column="3">
                     <Button
                         x:Name="BaseConfirmBtn"
                         Margin="0,0,20,0"
@@ -188,74 +229,124 @@
                         Content="{Binding [ConfirmBaseBtn], Source={x:Static local:LanguageManager.Instance}}"
                         IsEnabled="False" />
                 </Grid>
+            </Grid>
+        </Grid>
+
+        <Grid Grid.Row="3" Grid.ColumnSpan="2">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <Grid Grid.Row="0">
+                    <Label x:Name="FreeLabel" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
 
+                <Grid Row="1">
+                    <Label x:Name="OldCmdrLabel" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
             </Grid>
         </Grid>
 
-        <Grid Grid.Row="3">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+        <Grid
+            Grid.Row="3"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-                <Label Margin="30,0,0,0" Content="{Binding [FreeMutator], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
-                <Image x:Name="SelectFactor2" />
-                <Image x:Name="SelectFactor3" />
-                <Image x:Name="SelectFactor4" />
-                <Image x:Name="SelectFactor5" />
-                <Image x:Name="SelectFactor6" />
-                <Image x:Name="SelectFactor7" />
-                <Image x:Name="SelectFactor8" />
-            </StackPanel>
+                <Grid Grid.Row="0">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Factor_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
+
+                        <Image x:Name="SelectFactor1" Margin="0,0,0,0" />
+                        <Image x:Name="SelectFactor2" />
+                        <Image x:Name="SelectFactor3" />
+                        <Image x:Name="SelectFactor4" />
+                        <Image x:Name="SelectFactor5" />
+                        <Image x:Name="SelectFactor6" />
+                        <Image x:Name="SelectFactor7" />
+                        <Image x:Name="SelectFactor8" />
+                    </StackPanel>
+                </Grid>
+
+                <Grid Grid.Row="1">
+                    <StackPanel Orientation="Horizontal">
+                        <StackPanel.Resources>
+                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                                <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
+                            </Style>
+                        </StackPanel.Resources>
+
+
+                        <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="BeforeCommander2" />
+                        <Image x:Name="BeforeCommander3" />
+                        <Image x:Name="BeforeCommander4" />
+                        <Image x:Name="BeforeCommander5" />
+                        <Image x:Name="BeforeCommander6" />
+                        <Label
+                            x:Name="NewCmdrLabel"
+                            Margin="18,0,0,0"
+                            Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
+                        <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
+                        <Image x:Name="AfterCommander2" />
+                        <Image x:Name="AfterCommander3" />
+                        <Image x:Name="AfterCommander4" />
+                    </StackPanel>
+                </Grid>
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="4">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel.Resources>
-                    <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                        <EventSetter Event="MouseLeftButtonDown" Handler="Commander_MouseDown" />
-                    </Style>
-                </StackPanel.Resources>
+        <Grid Grid.Row="4" Grid.ColumnSpan="2">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-                <Label Margin="30,0,0,0" Content="{Binding [OldCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="BeforeCommander1" Margin="0,0,0,0" />
-                <Image x:Name="BeforeCommander2" />
-                <Image x:Name="BeforeCommander3" />
-                <Image x:Name="BeforeCommander4" />
-                <Image x:Name="BeforeCommander5" />
-                <Image x:Name="BeforeCommander6" />
-                <Label Margin="18,0,0,0" Content="{Binding [NewCommander], Source={x:Static local:LanguageManager.Instance}}" />
-                <Image x:Name="AfterCommander1" Margin="0,0,0,0" />
-                <Image x:Name="AfterCommander2" />
-                <Image x:Name="AfterCommander3" />
-                <Image x:Name="AfterCommander4" />
-            </StackPanel>
+                <Grid Row="0">
+                    <Label Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Row="1">
+                    <Label Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+
+                <Grid Row="2">
+                    <Label Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+                </Grid>
+            </Grid>
         </Grid>
 
-        <Grid Grid.Row="5">
+        <Grid
+            Grid.Row="4"
+            Grid.Column="2"
+            Grid.ColumnSpan="4">
             <Grid.RowDefinitions>
-                <RowDefinition Height="100" />
-                <RowDefinition Height="100" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
 
-            <Grid Grid.Row="0">
-                <Line
-                    Stroke="Gray"
-                    StrokeThickness="6"
-                    X1="0"
-                    X2="1180"
-                    Y1="0"
-                    Y2="0" />
+            <Grid Grid.Row="0" Grid.ColumnSpan="2">
                 <StackPanel Orientation="Horizontal">
-                    <Label Margin="18,10,0,0" Content="{Binding [HasSelectMap], Source={x:Static local:LanguageManager.Instance}}" />
-                    <Image
-                        x:Name="HasSelectMap"
-                        Margin="10,0,0,0"
-                        Style="{StaticResource MapImg}" />
+                    <Image x:Name="HasSelectMap" Style="{StaticResource MapImg}" />
                     <TextBlock
                         x:Name="MapTip"
                         Margin="50,0,0,0"
@@ -269,53 +360,58 @@
 
             <Grid Grid.Row="1">
                 <StackPanel Orientation="Horizontal">
-                    <StackPanel Orientation="Horizontal">
-                        <StackPanel.Resources>
-                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                                <EventSetter Event="MouseLeftButtonDown" Handler="CancelBase_MouseDown" />
-                            </Style>
-                        </StackPanel.Resources>
-
-                        <Label Margin="18,0,0,0" Content="{Binding [HasSelectBaseMutators], Source={x:Static local:LanguageManager.Instance}}" />
-                        <Image x:Name="HasSelectBaseFactor1" Margin="0,0,0,0" />
-                        <Image x:Name="HasSelectBaseFactor2" />
-                        <Image x:Name="HasSelectBaseFactor3" />
-                    </StackPanel>
-
-                    <StackPanel Orientation="Horizontal">
-                        <StackPanel.Resources>
-                            <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
-                                <EventSetter Event="MouseLeftButtonDown" Handler="CancelFactor_MouseDown" />
-                            </Style>
-                        </StackPanel.Resources>
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                            <EventSetter Event="MouseLeftButtonDown" Handler="CancelBase_MouseDown" />
+                        </Style>
+                    </StackPanel.Resources>
 
-                        <Label
-                            Margin="18,0,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}"
-                            FontSize="20"
-                            FontWeight="Bold" />
-                        <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
-                        <Image x:Name="HasSelectFactor2" />
-                        <Image x:Name="HasSelectFactor3" />
-                        <Image x:Name="HasSelectFactor4" />
-                        <Image x:Name="HasSelectFactor5" />
-                    </StackPanel>
+                    <Image x:Name="HasSelectBaseFactor1" Margin="0,0,0,0" />
+                    <Image x:Name="HasSelectBaseFactor2" />
+                    <Image x:Name="HasSelectBaseFactor3" />
                 </StackPanel>
+            </Grid>
 
+            <Grid
+                Grid.Row="1"
+                Grid.Column="0"
+                Grid.ColumnSpan="2">
+                <Label
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    HorizontalContentAlignment="Right"
+                    Content="{Binding [HasSelectFreeMutators], Source={x:Static local:LanguageManager.Instance}}"
+                    FontSize="20"
+                    FontWeight="Bold" />
             </Grid>
 
-            <Grid Grid.Row="2" />
+            <Grid
+                Grid.Row="1"
+                Grid.Column="2"
+                Grid.ColumnSpan="2">
+                <StackPanel Orientation="Horizontal">
+                    <StackPanel.Resources>
+                        <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
+                            <EventSetter Event="MouseLeftButtonDown" Handler="CancelFactor_MouseDown" />
+                        </Style>
+                    </StackPanel.Resources>
 
-            <Grid Grid.Row="3">
+                    <Image x:Name="HasSelectFactor1" Margin="0,0,0,0" />
+                    <Image x:Name="HasSelectFactor2" />
+                    <Image x:Name="HasSelectFactor3" />
+                    <Image x:Name="HasSelectFactor4" />
+                    <Image x:Name="HasSelectFactor5" />
+                </StackPanel>
+            </Grid>
+
+            <Grid Grid.Row="2" ColumnSpan="4">
                 <StackPanel Orientation="Horizontal">
                     <StackPanel.Resources>
                         <Style BasedOn="{StaticResource ClickableImg}" TargetType="Image">
                             <EventSetter Event="MouseLeftButtonDown" Handler="CancelCommander_MouseDown" />
                         </Style>
                     </StackPanel.Resources>
-                    <Label Margin="18,0,0,0" Content="{Binding [HasSelectCommanders], Source={x:Static local:LanguageManager.Instance}}" />
+
                     <Image x:Name="HasSelectCommander1" Margin="0,0,0,0" />
                     <Image x:Name="HasSelectCommander2" />
                     <TextBlock
@@ -327,11 +423,53 @@
                         Foreground="Red"
                         Text="" />
                 </StackPanel>
+            </Grid>
+
+            <Grid Grid.Row="2" Grid.Column="3">
                 <Button
                     Margin="0,0,20,0"
                     Click="Button_Confirm_Click"
                     Content="{Binding [ConfirmBtn], Source={x:Static local:LanguageManager.Instance}}" />
             </Grid>
         </Grid>
+
+        <Grid
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="3"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="1"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
+
+        <Grid
+            Grid.Row="4"
+            Grid.Column="0"
+            Grid.ColumnSpan="7">
+            <Line
+                Stroke="Gray"
+                StrokeThickness="6"
+                X1="0"
+                X2="1180"
+                Y1="0"
+                Y2="0" />
+        </Grid>
     </Grid>
 </Page>
diff --git a/LiaoTian_Cup/Mode/USuckModeWindow.xaml.cs b/LiaoTian_Cup/Mode/USuckModeWindow.xaml.cs
index 50dcae9..63ab0ee 100644
--- a/LiaoTian_Cup/Mode/USuckModeWindow.xaml.cs
+++ b/LiaoTian_Cup/Mode/USuckModeWindow.xaml.cs
@@ -6,6 +6,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using LiaoTian_Cup.Overview;
 
@@ -119,6 +120,13 @@ public void ResetFunc()
             hasSelectMap = new Image();
             ClearRandomMaps();
             FlashHasSelectMap();
+
+            MapLabel.Foreground = Brushes.Black;
+            NegativeLabel.Foreground = Brushes.Black;
+            MultilineLabel.Foreground = Brushes.Black;
+            FreeLabel.Foreground = Brushes.Black;
+            OldCmdrLabel.Foreground = Brushes.Black;
+            NewCmdrLabel.Foreground = Brushes.Black;
         }
 
         //开始随机事件响应
@@ -157,6 +165,7 @@ private void ShowRandomMaps()
             MapName1.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[0]]);
             MapName2.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[1]]);
             MapName3.Text = Dictionary.I18n.Lang.ResourceManager.GetString(FileData.mapsInfo[randNums[2]]);
+            MapLabel.Foreground = Brushes.Red;
         }
 
         //点击地图图片事件响应
@@ -214,12 +223,14 @@ private void Button_MapConfirm_Click(object sender, RoutedEventArgs e)
             SetRandMapEnable(false);
             ShowBaseNegativeFactor();
             ShowBaseMultiFactor();
+            MapLabel.Foreground = Brushes.Gray;
         }
 
 
         //正面因子显示
         private void ShowBaseNegativeFactor()
         {
+            NegativeLabel.Foreground = Brushes.Red;
             //相对路径URI指定因子图片来源
             NegativeFactor1.Source = new BitmapImage(new Uri(factorDir + FileData.usuckNegativeFactorInfo[0] + ".png", UriKind.Relative));
             NegativeFactor2.Source = new BitmapImage(new Uri(factorDir + FileData.usuckNegativeFactorInfo[1] + ".png", UriKind.Relative));
@@ -240,6 +251,7 @@ private void ShowBaseNegativeFactor()
         //多线因子显示
         private void ShowBaseMultiFactor()
         {
+            MultilineLabel.Foreground = Brushes.Red;
             MultiFactor1.Source = new BitmapImage(new Uri(factorDir + FileData.usuckMultiFactorInfo[0] + ".png", UriKind.Relative));
             MultiFactor2.Source = new BitmapImage(new Uri(factorDir + FileData.usuckMultiFactorInfo[1] + ".png", UriKind.Relative));
             MultiFactor3.Source = new BitmapImage(new Uri(factorDir + FileData.usuckMultiFactorInfo[2] + ".png", UriKind.Relative));
@@ -311,6 +323,12 @@ private void Button_BaseConfirm_Click(Object sender, RoutedEventArgs e)
             SetBaseFactorEnable(false);
             ShowRandomFactor();
             RandomCommanderInfo();
+
+            NegativeLabel.Foreground = Brushes.Gray;
+            MultilineLabel.Foreground = Brushes.Gray;
+            FreeLabel.Foreground = Brushes.Red;
+            OldCmdrLabel.Foreground = Brushes.Red;
+            NewCmdrLabel.Foreground = Brushes.Red;
         }
 
         //刷新已选基础因子事件
diff --git a/LiaoTian_Cup/Resources/database.db b/LiaoTian_Cup/Resources/database.db
index 78a231c..82680ee 100644
Binary files a/LiaoTian_Cup/Resources/database.db and b/LiaoTian_Cup/Resources/database.db differ
diff --git "a/LiaoTian_Cup/Resources/\350\207\264\345\221\275\344\274\231\344\274\264.png" "b/LiaoTian_Cup/Resources/\350\207\264\345\221\275\344\274\231\344\274\264.png"
deleted file mode 100644
index ba0cff0..0000000
Binary files "a/LiaoTian_Cup/Resources/\350\207\264\345\221\275\344\274\231\344\274\264.png" and /dev/null differ