diff --git a/BeWo/Styles/PrototypeStyles.xaml b/BeWo/Styles/PrototypeStyles.xaml
index 2467cf032..23c6122e9 100644
--- a/BeWo/Styles/PrototypeStyles.xaml
+++ b/BeWo/Styles/PrototypeStyles.xaml
@@ -141,10 +141,24 @@
     </Style>
     <Style BasedOn="{StaticResource {x:Type uc:NullItemComboBox}}" TargetType="uc:NullItemComboBox">
         <Setter Property="Margin" Value="3" />
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
     <Style BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="ComboBox">
         <Setter Property="Margin" Value="3" />
         <Setter Property="Height" Value="23" />
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
     <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="{x:Type CheckBox}">
         <Setter Property="Margin" Value="5" />
@@ -229,7 +243,7 @@
     <DataTemplate x:Key="ListItemView">
         <TextBlock
             Text="{Binding Path=., Converter={StaticResource EnumTranslationConverter}}"
-            TextWrapping="Wrap"
+            TextWrapping="NoWrap"
             ToolTip="{Binding Path=Text, RelativeSource={RelativeSource Self}}" />
     </DataTemplate>
     <Style
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index 8a2cc4d4f..79270631e 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -29,6 +29,7 @@
             <Style BasedOn="{StaticResource ObjectEditGroupBox}" TargetType="{x:Type GroupBox}">
                 <Setter Property="Margin" Value="15" />
                 <Setter Property="Padding" Value="10,7,7,5" />
+                <Setter Property="HorizontalAlignment" Value="Stretch" />
             </Style>
             <Style x:Key="StackpanelDetailsStyle" TargetType="{x:Type StackPanel}">
                 <Setter Property="Margin" Value="40,-1,0,3" />
@@ -67,7 +68,8 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition x:Name="grid_bund_column" Width="*" />
+                        <ColumnDefinition Width="300" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -82,21 +84,21 @@
                     <Label Grid.Row="0" Grid.Column="0">B1010 Verbandszugehörigkeit der Eintrichtung</Label>
                     <uc:NullItemComboBox
                         Grid.Row="0"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding VerbandszugehorigkeitTypes}"
                         SelectedValue="{Binding Verbandszugehorigkeit}" />
 
                     <Label Grid.Row="1" Grid.Column="0">B1020 Geschlecht nach Personenstandsurkunde</Label>
                     <uc:NullItemComboBox
                         Grid.Row="1"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding GeschlechtTypes}"
                         SelectedValue="{Binding Geschlecht}" />
 
                     <Label Grid.Row="2" Grid.Column="0">B1030 Alter am Stichtag</Label>
                     <dxe:TextEdit
                         Grid.Row="2"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         Height="23"
                         Margin="3"
                         dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
@@ -108,7 +110,7 @@
                     <Label Grid.Row="3" Grid.Column="0">B1040 Haushaltsgröße</Label>
                     <dxe:TextEdit
                         Grid.Row="3"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         Height="23"
                         Margin="3"
                         dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
@@ -120,7 +122,7 @@
                     <Label Grid.Row="4" Grid.Column="0">B1050 BerichtseinheitID</Label>
                     <dxe:TextEdit
                         Grid.Row="4"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         Height="23"
                         Margin="3"
                         dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
@@ -132,14 +134,14 @@
                     <Label Grid.Row="5" Grid.Column="0">B1060 Unterbringungsort</Label>
                     <uc:NullItemComboBox
                         Grid.Row="5"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding UnterbringungsartTypes}"
                         SelectedValue="{Binding Unterbringungsart}" />
 
                     <Label Grid.Row="6" Grid.Column="0">B1070 Ort der Unterbringung</Label>
                     <dxe:TextEdit
                         Grid.Row="6"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                         EditValue="{Binding Path=OrtDerEinrichtung, UpdateSourceTrigger=PropertyChanged}"
                         Mask="00000000"
@@ -149,7 +151,7 @@
                     <Label Grid.Row="7" Grid.Column="0">B1080 Angebot</Label>
                     <uc:NullItemComboBox
                         Grid.Row="7"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding AngebotTypes}"
                         SelectedValue="{Binding Angebot}" />
                 </Grid>
@@ -176,10 +178,10 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="300" />
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="300" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -308,7 +310,8 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition x:Name="grid_sozialstruktur_column" Width="*" />
+                        <ColumnDefinition Width="300" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -333,14 +336,14 @@
                     <Label Grid.Row="0" Grid.Column="0">K0110 Bundesland</Label>
                     <ComboBox
                         Grid.Row="0"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding BundeslandTypes}"
                         SelectedValue="{Binding Bundesland}" />
 
                     <Label Grid.Row="1" Grid.Column="0">K0120 Art des Hilfefelds</Label>
                     <StackPanel
                         Grid.Row="1"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         Orientation="Horizontal">
                         <RadioButton GroupName="Art" IsChecked="{Binding IsWohnungslosenhilfeSafe}">Wohnungslosenhilfe</RadioButton>
                         <RadioButton GroupName="Art" IsChecked="{Binding IsStraffaligenhilfeSafe}">Straffälligenhilfe</RadioButton>
@@ -349,27 +352,27 @@
                     <Label Grid.Row="2" Grid.Column="0">K0130 Art des Hilfeangebots</Label>
                     <ComboBox
                         Grid.Row="2"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding ArtDesHilfeangebotsTypes}"
                         SelectedValue="{Binding ArtDesHilfeangebots}" />
 
                     <Label Grid.Row="3" Grid.Column="0">K0140 Betreuungsbeginn</Label>
                     <dxe:DateEdit
                         Grid.Row="3"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         EditValue="{Binding Path=Betreuungsbeginn, UpdateSourceTrigger=PropertyChanged}" />
 
                     <Label Grid.Row="4" Grid.Column="0">K0150 Betreuungsende</Label>
                     <dxe:DateEdit
                         Grid.Row="4"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         EditValue="{Binding Path=Betreuungsende, UpdateSourceTrigger=PropertyChanged}"
                         ShowClearButton="True" />
 
                     <Label Grid.Row="5" Grid.Column="0">K0160 Betreuungsdauer in Tagen</Label>
                     <dxe:TextEdit
                         Grid.Row="5"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         Height="23"
                         Margin="3"
                         dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
@@ -381,7 +384,7 @@
                     <Label Grid.Row="6" Grid.Column="0">G7010 Art der Beendigung</Label>
                     <ComboBox
                         Grid.Row="6"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding ArtDerBeendigungTypes}"
                         SelectedValue="{Binding ArtDerBeendigung}" />
 
@@ -389,67 +392,67 @@
                     <dxe:DateEdit
                         x:Name="Dateedit"
                         Grid.Row="7"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         EditValue="{Binding Path=Geburtsdatum, UpdateSourceTrigger=PropertyChanged}" />
 
                     <Label Grid.Row="8" Grid.Column="0">G1020 Geschlechtsidentität</Label>
                     <ComboBox
                         Grid.Row="8"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding GeschlechtidentitatTypes}"
                         SelectedValue="{Binding Geschlechtidentitat}" />
 
                     <Label Grid.Row="9" Grid.Column="0">G1030 Staatsangehörigkeit</Label>
                     <ComboBox
                         Grid.Row="9"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding StaatsangehorigkeitTypes}"
                         SelectedValue="{Binding Staatsangehorigkeit}" />
 
                     <Label Grid.Row="10" Grid.Column="0">G1040 Aufenthaltsstatus</Label>
                     <ComboBox
                         Grid.Row="10"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding AufenthaltsstatusTypes}"
                         SelectedValue="{Binding Aufenthaltsstatus}" />
 
                     <Label Grid.Row="11" Grid.Column="0">G1050 Migrationshintergrund</Label>
                     <ComboBox
                         Grid.Row="11"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding WohnhilfeBoolDataTypes}"
                         SelectedValue="{Binding Migrationshintergrund}" />
 
                     <Label Grid.Row="12" Grid.Column="0">W1060 Höchster erreichter Schulabschluss</Label>
                     <ComboBox
                         Grid.Row="12"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding HochsterSchulabschlussTypes}"
                         SelectedValue="{Binding HochsterSchulabschluss}" />
 
                     <Label Grid.Row="13" Grid.Column="0">G1070 Familienstand</Label>
                     <ComboBox
                         Grid.Row="13"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding FamilienstandTypes}"
                         SelectedValue="{Binding Familienstand}" />
 
                     <Label Grid.Row="14" Grid.Column="0">G1080 Haushaltsstruktur</Label>
                     <ComboBox
                         Grid.Row="14"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         ItemsSource="{Binding HaushaltsstrukturTypes}"
                         SelectedValue="{Binding Haushaltsstruktur}" />
 
                     <Label
                         Grid.Row="15"
                         Grid.Column="0"
-                        Grid.ColumnSpan="2">
+                        Grid.ColumnSpan="3">
                         G1090 Eigene minderjährige Kinder außerhalb der Haushaltsstruktur
                     </Label>
                     <ComboBox
                         Grid.Row="16"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         Margin="3,-2,3,3"
                         ItemsSource="{Binding WohnhilfeBoolDataTypes}"
                         SelectedValue="{Binding EigeneMindKinderAuserhalbHaushaltsstruktur}" />
@@ -466,10 +469,10 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="300" />
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="300" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
index d26716b6a..ef694e262 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
@@ -97,6 +97,9 @@ namespace BeWo.View.Controls.Wohnhilfe
         {
             grid_secondcolumn.Width = new GridLength(2, GridUnitType.Star);
 
+            grid_bund_column.Width = new GridLength(1, GridUnitType.Star);
+            grid_sozialstruktur_column.Width = new GridLength(1, GridUnitType.Star);
+
             Grid.SetColumn(groupbox_2, 1);
             Grid.SetRow(groupbox_2, 0);
             Grid.SetColumn(groupbox_3, 0);
@@ -109,6 +112,9 @@ namespace BeWo.View.Controls.Wohnhilfe
         {
             grid_secondcolumn.Width = new GridLength(0);
 
+            grid_bund_column.Width = new GridLength(0);
+            grid_sozialstruktur_column.Width = new GridLength(0);
+
             Grid.SetColumn(groupbox_2, 0);
             Grid.SetRow(groupbox_2, 1);
             Grid.SetColumn(groupbox_3, 0);