diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 257f736b7..2be9f4505 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -293,6 +293,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\ControlStyles\GroupBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\ControlStyles\LabelStyles.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/BeWo/Styles/Colors/Colors.xaml b/BeWo/Styles/Colors/Colors.xaml
index 6d82f9f5d..af79deddd 100644
--- a/BeWo/Styles/Colors/Colors.xaml
+++ b/BeWo/Styles/Colors/Colors.xaml
@@ -5,4 +5,6 @@
     <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FFFDC784" />
     <SolidColorBrush x:Key="ControlSelectedBackgroundBrush" Color="#FFFFD86C" />
     <SolidColorBrush x:Key="ControlMouseOverBackgroundBrush" Color="#FFDCA158" />
+
+    <SolidColorBrush x:Key="TabItemHotTextBrush" Color="#FFAB4A07" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/GroupBoxStyles.xaml b/BeWo/Styles/ControlStyles/GroupBoxStyles.xaml
new file mode 100644
index 000000000..fa4852bd1
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/GroupBoxStyles.xaml
@@ -0,0 +1,52 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="BaseGroupBox" TargetType="{x:Type GroupBox}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="3" />
+    </Style>
+    <Style
+        x:Key="ObjectEditGroupBox"
+        BasedOn="{StaticResource BaseGroupBox}"
+        TargetType="{x:Type GroupBox}">
+        <!-- <Setter Property="BorderBrush" Value="#D5DFE5" />-->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GroupBox}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <Border
+                            x:Name="Header"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            MinHeight="20"
+                            Padding="3,0,3,0"
+                            TextElement.FontFamily="Microsoft Sans Serif"
+                            TextElement.FontSize="16"
+                            TextElement.Foreground="{StaticResource TabItemHotTextBrush}">
+                            <ContentPresenter
+                                ContentSource="Header"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                        <Border
+                            Grid.Row="1"
+                            BorderBrush="#FF86878F"
+                            BorderThickness="0,0,0,1" />
+                        <ContentPresenter
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/TextEditStyles.xaml b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
index 98a1c219f..0795c898d 100644
--- a/BeWo/Styles/ControlStyles/TextEditStyles.xaml
+++ b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
@@ -9,6 +9,12 @@
         <Setter Property="Margin" Value="3" />
         <Setter Property="Height" Value="23" />
     </Style>
+    <Style
+        x:Key="BaseNumberTextEdit"
+        BasedOn="{StaticResource BaseTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="MaskType" Value="Numeric" />
+    </Style>
     <Style
         x:Key="BaseNumberMaskTextEdit"
         BasedOn="{StaticResource BaseTextEdit}"
diff --git a/BeWo/Styles/ModernOrangeBlack.xaml b/BeWo/Styles/ModernOrangeBlack.xaml
index 945963d94..357934f1f 100644
--- a/BeWo/Styles/ModernOrangeBlack.xaml
+++ b/BeWo/Styles/ModernOrangeBlack.xaml
@@ -16,6 +16,7 @@
         <ResourceDictionary Source="ControlStyles\ComboBoxStyles.xaml" />
         <ResourceDictionary Source="ControlStyles\CustomControlsStyles.xaml" />
         <ResourceDictionary Source="ControlStyles\DateEditStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\GroupBoxStyles.xaml" />
         <ResourceDictionary Source="ControlStyles\LabelStyles.xaml" />
         <ResourceDictionary Source="ControlStyles\ListBoxStyles.xaml" />
         <ResourceDictionary Source="ControlStyles\RadioButtonStyles.xaml" />
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index 78172cc68..5dd9f39df 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -112,14 +112,16 @@
                         Grid.Row="2"
                         Grid.Column="2"
                         EditValue="{Binding Path=AlterAmStichtag, UpdateSourceTrigger=PropertyChanged}"
-                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}" />
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                        Style="{StaticResource BaseNumberTextEdit}"/>
 
                     <Label Grid.Row="3" Grid.Column="0">B1040 Haushaltsgröße</Label>
                     <dxe:TextEdit
                         Grid.Row="3"
                         Grid.Column="2"
                         EditValue="{Binding Path=Haushaltsgrosse, UpdateSourceTrigger=PropertyChanged}"
-                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}" />
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                        Style="{StaticResource BaseNumberTextEdit}" />
 
                     <Label Grid.Row="4" Grid.Column="0">B1050 BerichtseinheitID</Label>
                     <dxe:TextEdit
@@ -388,7 +390,8 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         EditValue="{Binding Path=BetreuungsdauerInTagen, UpdateSourceTrigger=PropertyChanged}"
-                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"/>
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                        Style="{StaticResource BaseNumberTextEdit}" />
 
                     <Label Grid.Row="6" Grid.Column="0">G7010 Art der Beendigung</Label>
                     <ComboBox
diff --git a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
index cfdc9f390..c8d8557b2 100644
--- a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
+++ b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
@@ -1,5 +1,4 @@
 <UserControl
-    x:Name="root"
     x:Class="BeWo.View.Detail.CustomerVermittlungArbeitView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,6 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:BeWo.View.Detail"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="root"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -17,7 +17,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid>
+    <GroupBox Header="Vermittlung Gemeinnützige Arbeit" Style="{StaticResource ObjectEditGroupBox}">
         <Grid DataContext="{Binding CustomerGemeinnutzigeArbeitListVM}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
@@ -66,5 +66,5 @@
                 </TabControl.ContentTemplate>
             </TabControl>
         </Grid>
-    </Grid>
+    </GroupBox>
 </UserControl>
diff --git a/BeWo/View/Detail/CustomerWohnhilfeView.xaml b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
index 73ef891eb..b518e5001 100644
--- a/BeWo/View/Detail/CustomerWohnhilfeView.xaml
+++ b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
@@ -24,7 +24,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid>
+    <GroupBox Header="Wohnungslosenhilfe" Style="{StaticResource ObjectEditGroupBox}">
         <Grid DataContext="{Binding CustomerWohnhilfeListVM}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -129,5 +129,5 @@
                 </Border>
             </Popup>
         </Grid>
-    </Grid>
+    </GroupBox>
 </UserControl>