diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml
index ee8aa619..cf06a127 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.xaml
@@ -114,51 +114,45 @@
             <TextBlock FontWeight="Bold" Text="{Binding VersionInfo}" VerticalAlignment="Center" Foreground="{DynamicResource PrimaryTextBrush}"/>
         </Border>
     </StackPanel>
-    <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" hc:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
+    <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
     <Popup AllowsTransparency="True" Grid.Column="1" PlacementTarget="{Binding ElementName=ButtonConfig}" HorizontalOffset="-28" Name="PopupConfig" VerticalOffset="6" StaysOpen="False">
         <Border Background="{DynamicResource SecondaryRegionBrush}" CornerRadius="4" Margin="16" Effect="{StaticResource EffectShadow2}">
             <StackPanel Orientation="Horizontal">
-                <StackPanel Orientation="Horizontal" Margin="10">
-                    <StackPanel Button.Click="ButtonLangs_OnClick">
-                        <Button Tag="zh-cn" Style="{StaticResource ButtonCustom}">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/cn.png"/>
-                        </Button>
-                        <Button Tag="en" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/en.png"/>
-                        </Button>
-                        <Button Tag="fa" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/fa.png"/>
-                        </Button>
-                        <Button Tag="fr" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/fr.png"/>
-                        </Button>
-                        <Button Tag="ca-ES" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ca-Es.png"/>
-                        </Button>
-                    </StackPanel>
-                    <StackPanel Button.Click="ButtonLangs_OnClick" Margin="10,0,0,0">
-                        <Button Tag="ko-KR" Style="{StaticResource ButtonCustom}">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ko-KR.png"/>
-                        </Button>
-                        <Button Tag="ru" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ru.png"/>
-                        </Button>
-                        <Button Tag="tr" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/tr.png"/>
-                        </Button>
-                        <Button Tag="pt-BR" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/pt-BR.png"/>
-                        </Button>
-                        <Button Tag="pl" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/pl.png" />
-                        </Button>
-                    </StackPanel>
-                    <StackPanel Button.Click="ButtonLangs_OnClick" Margin="10,0,0,0">
-                        <Button Tag="es" Style="{StaticResource ButtonCustom}">
-                            <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/es.png"/>
-                        </Button>
-                    </StackPanel>
-                </StackPanel>
+                <hc:UniformSpacingPanel Button.Click="ButtonLangs_OnClick" Orientation="Vertical" Margin="10" Spacing="10" ChildWrapping="Wrap" MaxHeight="134">
+                    <Button Tag="zh-cn" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/cn.png"/>
+                    </Button>
+                    <Button Tag="en" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/en.png"/>
+                    </Button>
+                    <Button Tag="fa" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/fa.png"/>
+                    </Button>
+                    <Button Tag="fr" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/fr.png"/>
+                    </Button>
+                    <Button Tag="ca-ES" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ca-Es.png"/>
+                    </Button>
+                    <Button Tag="ko-KR" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ko-KR.png"/>
+                    </Button>
+                    <Button Tag="ru" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/ru.png"/>
+                    </Button>
+                    <Button Tag="tr" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/tr.png"/>
+                    </Button>
+                    <Button Tag="pt-BR" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/pt-BR.png"/>
+                    </Button>
+                    <Button Tag="pl" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/pl.png" />
+                    </Button>
+                    <Button Tag="es" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/es.png"/>
+                    </Button>
+                </hc:UniformSpacingPanel>
                 <hc:Divider LineStrokeDashArray="2,2" Orientation="Vertical" Margin="0,20" LineStrokeThickness="2"/>
                 <StackPanel Button.Click="ButtonSkins_OnClick"  Margin="10,10,10,10">
                     <Button Tag="{x:Static hc:SkinType.Default}" Style="{StaticResource ButtonCustom}">