diff --git a/SicSetupMaker/MainWindow.xaml b/SicSetupMaker/MainWindow.xaml
index 280555a0..b074fc87 100644
--- a/SicSetupMaker/MainWindow.xaml
+++ b/SicSetupMaker/MainWindow.xaml
@@ -10,85 +10,87 @@
         Title="MainWindow" Height="800" Width="1024"
         d:DataContext="{d:DesignInstance Type=local:MainWindowViewModel,IsDesignTimeCreatable=False}">
     <Grid Margin="10,10,10,10" >
-        <Grid.Resources>
-            <Style TargetType="GroupBox" BasedOn="{StaticResource MaterialDesignCardGroupBox}">
-                <Setter Property="Margin" Value="5"/>
-            </Style>
-        </Grid.Resources>
         <Grid.RowDefinitions>
             <RowDefinition Height="350"/>
-            <RowDefinition Height="5"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="50"/>
         </Grid.RowDefinitions>
-     
 
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition MinWidth="100" Width="300"/>
-                <ColumnDefinition Width="5"/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="100"/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
+        <materialDesign:Card>
+            <TabControl HorizontalContentAlignment="Left"
+                    materialDesign:ColorZoneAssist.Mode="PrimaryMid"
+                    Style="{StaticResource MaterialDesignFilledTabControl}">
+                
+                <TabItem Header="新发行">
+                    <Grid Margin="5">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="60"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
 
-            <GroupBox Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Header="发行历史">
-                <TextBox 
-                    IsTabStop="False"
-                    IsReadOnly="True"
-                    Style="{StaticResource MaterialDesignFilledTextBox}"
-                    TextWrapping="Wrap"
-                    VerticalScrollBarVisibility="Auto" Margin="0,0,2,0"/>
-            </GroupBox>
+                        <Grid Margin="0 10 0 0" HorizontalAlignment="Left">
+                            <Grid.Resources>
+                                <Style TargetType="TextBox" BasedOn="{StaticResource MaterialDesignFilledTextBox}">
+                                    <Setter Property="Margin" Value="5 0 "/>
+                                </Style>
+                            </Grid.Resources>
 
-            <GridSplitter Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" Width="5" Height="20" HorizontalAlignment="Center" />
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition MinWidth="100"/>
+                                <ColumnDefinition MinWidth="100"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBox materialDesign:HintAssist.Hint="前缀" Text="{Binding Version.Prefix}" d:Text=""/>
+                            <TextBox Grid.Column="1" materialDesign:HintAssist.Hint="主版本" Text="{Binding Version.Major}" d:Text="1"/>
+                            <TextBox Grid.Column="2" materialDesign:HintAssist.Hint="此版本" Text="{Binding Version.Minor}" d:Text="2"/>
+                            <TextBox Grid.Column="3" materialDesign:HintAssist.Hint="修订" Text="{Binding Version.Patch}" d:Text="10"/>
+                            <TextBox Grid.Column="4" materialDesign:HintAssist.Hint="后缀" Text="{Binding Version.Suffix}" d:Text="beta1"/>
+                        </Grid>
 
-            <GroupBox Grid.Row="0" Grid.Column="2" Header="当前版本" >
-                <StackPanel Orientation="Horizontal">
-                    <StackPanel.Resources>
-                        <Style TargetType="TextBox" BasedOn="{StaticResource MaterialDesignFloatingHintTextBox}">
-                            <Setter Property="Margin" Value="5 0"/>
-                            <Setter Property="Width" Value="100"/>
-                        </Style>
-                    </StackPanel.Resources>
 
-                    <TextBox materialDesign:HintAssist.Hint="前缀" Text="{Binding VerPrefix}" d:Text=""/>
-                    <TextBox materialDesign:HintAssist.Hint="主版本" Text="{Binding VerMajor}" d:Text="1"/>
-                    <TextBox materialDesign:HintAssist.Hint="此版本" Text="{Binding VerMinor}" d:Text="2"/>
-                    <TextBox materialDesign:HintAssist.Hint="修订" Text="{Binding VerPatch}" d:Text="10"/>
-                    <TextBox materialDesign:HintAssist.Hint="后缀" Text="{Binding VerSuffix}" d:Text="beta1"/>
-                </StackPanel>
-            </GroupBox>
+                        <Grid Grid.Row="1" Margin="0 10 0 0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="3"/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
 
-            <GroupBox Header="新发行记录" Grid.Row="1" Grid.Column="2">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition Width="3"/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
+                            <TextBox Grid.Column="0" materialDesign:HintAssist.Hint="新特性"
+                                 AcceptsReturn="True"
+                                 Style="{StaticResource MaterialDesignFilledTextBox}"
+                                 TextWrapping="Wrap"
+                                 VerticalScrollBarVisibility="Auto" Margin="0,0,2,0"/>
 
-                    <TextBox Grid.Column="0" materialDesign:HintAssist.Hint="新特性"
-                 AcceptsReturn="True"
-                 Style="{StaticResource MaterialDesignOutlinedTextBox}"
-                 TextWrapping="Wrap"
-                 VerticalScrollBarVisibility="Auto" Margin="0,0,2,0"/>
+                            <TextBox Grid.Column="2" materialDesign:HintAssist.Hint="Bug修复"
+                                 AcceptsReturn="True"
+                                 Style="{StaticResource MaterialDesignFilledTextBox}"
+                                 TextWrapping="Wrap"
+                                 VerticalScrollBarVisibility="Auto"/>
+                        </Grid>
+                    </Grid>
+                </TabItem>
 
-                    <TextBox Grid.Column="2" materialDesign:HintAssist.Hint="Bug修复"
-                 AcceptsReturn="True"
-                 Style="{StaticResource MaterialDesignOutlinedTextBox}"
-                 TextWrapping="Wrap"
-                 VerticalScrollBarVisibility="Auto"/>
-                 
-                </Grid>
+                <TabItem Header="发行历史">
+                    <TextBox 
+                        IsTabStop="False"
+                        IsReadOnly="True"
+                        Style="{StaticResource MaterialDesignFilledTextBox}"
+                        TextWrapping="Wrap"
+                        VerticalScrollBarVisibility="Auto" 
+                        Margin="10"/>
+                </TabItem>
 
-            </GroupBox>
+            </TabControl>
+        </materialDesign:Card>
 
-        </Grid>
-
-        <GridSplitter Grid.Row="1" Height="5" Width="100" ResizeDirection="Rows" HorizontalAlignment="Center"/>
+        <GridSplitter Grid.Row="1" Height="5" Width="100" 
+                      ResizeDirection="Rows" 
+                      VerticalAlignment="Center" 
+                      HorizontalAlignment="Center"
+                      Margin="0 5"/>
 
         <GroupBox Header="Logs" Grid.Row="2">
             <ListView ItemsSource="{Binding Logs}" d:ItemsSource="{d:SampleData ItemCount=5}">