diff --git a/demo/Ursa.Demo/Pages/FormDemo.axaml b/demo/Ursa.Demo/Pages/FormDemo.axaml
index 61423b2..288392a 100644
--- a/demo/Ursa.Demo/Pages/FormDemo.axaml
+++ b/demo/Ursa.Demo/Pages/FormDemo.axaml
@@ -45,6 +45,19 @@
                 <u:FormItem Label="Please select a Date">
                     <CalendarDatePicker SelectedDate="{Binding Date}" />
                 </u:FormItem>
+                
+                <u:FormGroup Header="Education">
+                    <TextBox
+                        HorizontalAlignment="Stretch"
+                        u:FormItem.IsRequired="True"
+                        u:FormItem.Label="Name"
+                        Text="{Binding Name}" />
+                    <TextBox
+                        HorizontalAlignment="Stretch"
+                        u:FormItem.Label="Email"
+                        u:FormItem.IsRequired="True"
+                        Text="{Binding Email}" />
+                </u:FormGroup>
                 <u:FormItem Label="Click to Submit">
                     <Button Content="Button With Label" />
                 </u:FormItem>
diff --git a/src/Ursa.Themes.Semi/Controls/Form.axaml b/src/Ursa.Themes.Semi/Controls/Form.axaml
index 67a9a0c..039fa0e 100644
--- a/src/Ursa.Themes.Semi/Controls/Form.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Form.axaml
@@ -21,7 +21,7 @@
     <ControlTheme x:Key="{x:Type u:FormGroup}" TargetType="u:FormGroup">
         <Setter Property="Template">
             <ControlTemplate TargetType="u:FormGroup">
-                <StackPanel>
+                <StackPanel Margin="0 28 0 0">
                     <ContentPresenter Content="{TemplateBinding Header}" FontWeight="Bold" FontSize="18" />
                     <Rectangle
                         Height="1"