diff --git a/DefaultControls/TabControl.xaml b/DefaultControls/TabControl.xaml
index 976804e..e9a108f 100644
--- a/DefaultControls/TabControl.xaml
+++ b/DefaultControls/TabControl.xaml
@@ -13,8 +13,7 @@
                 <ControlTemplate TargetType="{x:Type TabControl}">
                     <Grid KeyboardNavigation.TabNavigation="Local">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition x:Name="ColumnDefinition0" Width="67*" />
-                            <ColumnDefinition Width="58*"/>
+                            <ColumnDefinition x:Name="ColumnDefinition0" />
                             <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
@@ -22,7 +21,7 @@
                             <RowDefinition Height="*" x:Name="RowDefinition1" />
                         </Grid.RowDefinitions>
                         <Border x:Name="HeaderBorder" Background="{DynamicResource PopupBackgroundBrush}"
-                                BorderThickness="0,0,0,1" BorderBrush="{DynamicResource PopupBorderBrush}" Margin="2,0,2,0" Grid.ColumnSpan="2">
+                                BorderThickness="0,0,0,1" BorderBrush="{DynamicResource PopupBorderBrush}" Margin="2,0,2,0">
                             <TabPanel x:Name="HeaderPanel" IsItemsHost="True" Panel.ZIndex="1" Width="Auto" Height="Auto"
                                       KeyboardNavigation.TabIndex="1" RenderTransformOrigin="0.5,0.5">
                                 <TabPanel.LayoutTransform>
@@ -45,7 +44,7 @@
                         </Border>
                         <Border x:Name="ContentPanel" Grid.Column="0" Grid.Row="1" BorderBrush="{DynamicResource PopupBorderBrush}" BorderThickness="1,0,1,1" Margin="2,0,2,2"
                                 KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabIndex="2" Padding="5"
-                                KeyboardNavigation.TabNavigation="Local" Background="{DynamicResource NormalBrushDark}" Grid.ColumnSpan="2">
+                                KeyboardNavigation.TabNavigation="Local" Background="{DynamicResource NormalBrushDark}" >
                             <ContentPresenter x:Name="PART_SelectedContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                               ContentSource="SelectedContent" />
                         </Border>