diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml
index 8151add5..2e8a04a3 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@@ -87,10 +87,23 @@
             </ComboBox>
 
             <TextBlock Grid.Row="2" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.General.SubjectGuideLength}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <NumericUpDown Grid.Row="2" Grid.Column="1"
+                           Minimum="50" Maximum="1000" Increment="1"
+                           Height="28"
+                           Padding="4"
+                           ShowButtonSpinner="False"
+                           BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
+                           CornerRadius="3"
+                           Value="{Binding SubjectGuideLength, Mode=TwoWay}"/>
+
+            <TextBlock Grid.Row="3" Grid.Column="0"
                        Text="{DynamicResource Text.Preference.General.MaxHistoryCommits}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
-            <Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="*,64">
+            <Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,64">
               <Slider Grid.Column="0"
                       Minimum="20000" Maximum="100000"
                       TickPlacement="BottomRight" TickFrequency="5000"
@@ -113,34 +126,6 @@
                          Foreground="{DynamicResource Brush.FG1}"
                          Text="{Binding MaxHistoryCommits}"/>
             </Grid>
-            
-            <TextBlock Grid.Row="3" Grid.Column="0"
-                       Text="{DynamicResource Text.Preference.General.SubjectGuideLength}"
-                       HorizontalAlignment="Right"
-                       Margin="0,0,16,0"/>
-            <Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,64">
-              <Slider Grid.Column="0"
-                      Minimum="50" Maximum="250"
-                      TickPlacement="BottomRight" TickFrequency="4"
-                      IsSnapToTickEnabled="False"
-                      VerticalAlignment="Center"
-                      Foreground="{DynamicResource Brush.Border1}"
-                      Value="{Binding SubjectGuideLength, Mode=TwoWay}">
-                <Slider.Resources>
-                  <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
-                  <GridLength x:Key="SliderPreContentMargin">0</GridLength>
-                  <GridLength x:Key="SliderPostContentMargin">0</GridLength>
-                  <CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
-                  <x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
-                  <x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
-                </Slider.Resources>
-              </Slider>
-
-              <TextBlock Grid.Column="1"
-                         HorizontalAlignment="Right" VerticalAlignment="Center"
-                         Foreground="{DynamicResource Brush.FG1}"
-                         Text="{Binding SubjectGuideLength}"/>
-            </Grid>
 
             <CheckBox Grid.Row="4" Grid.Column="1"
                       Content="{DynamicResource Text.Preference.General.RestoreTabs}"
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index b6700940..ff9d5dda 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -117,7 +117,7 @@
                   BorderBrush="{DynamicResource Brush.Border0}"/>
 
     <!-- Right -->
-    <Grid Grid.Column="2" Margin="0,4,4,4" RowDefinitions="*,Auto,32">
+    <Grid Grid.Column="2" Margin="0,4,4,4" RowDefinitions="*,4,128,36">
       <!-- Select Change Detail -->
       <Grid Grid.Row="0">
         <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
@@ -158,14 +158,16 @@
         </ContentControl>
       </Grid>
 
+      <!-- Splitter -->
+      <GridSplitter Grid.Row="1" MinHeight="1"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                    Background="Transparent"/>
+
       <!-- Commit Message -->
-      <v:CommitMessageTextBox Grid.Row="1"
-                              Height="100"
-                              Margin="0,4"
-                              Text="{Binding CommitMessage, Mode=TwoWay}"/>
+      <v:CommitMessageTextBox Grid.Row="2" Text="{Binding CommitMessage, Mode=TwoWay}"/>
 
       <!-- Commit Options -->
-      <Grid Grid.Row="2" ColumnDefinitions="Auto,Auto,*,Auto,Auto,Auto">
+      <Grid Grid.Row="3" Margin="0,6,0,0" ColumnDefinitions="Auto,Auto,*,Auto,Auto,Auto">
         <Button Grid.Column="0"
                 Classes="icon_button"
                 Width="14" Height="14"