diff --git a/WGneu/Windows/MemberListWindow.xaml b/WGneu/Windows/MemberListWindow.xaml
index eb34e28..17e50a3 100644
--- a/WGneu/Windows/MemberListWindow.xaml
+++ b/WGneu/Windows/MemberListWindow.xaml
@@ -6,6 +6,30 @@
         xmlns:local="clr-namespace:WGneu.Windows"
         Title="Mitglieder" Height="600" Width="1200" MinHeight="600" MinWidth="1000"
         Loaded="Window_Loaded">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="20"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="IsReadOnly" Value="True"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="ComboBox">
+            <Setter Property="IsEnabled" Value="False"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+    </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="19"/>
@@ -44,8 +68,8 @@
                 <ColumnDefinition Width="115"/>
             </Grid.ColumnDefinitions>
 
-            <TextBox x:Name="SearchInput" TextChanged="SearchInput_TextChanged"
-                     Grid.ColumnSpan="3" Margin="10,7,10,0" VerticalAlignment="Top" FontSize="14" Padding="2,2,2,2"/>
+            <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="10,7,10,0" IsReadOnly="False"
+                     TextChanged="SearchInput_TextChanged"/>
             <DataGrid x:Name="MemberList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
                       SelectionChanged="MemberList_SelectionChanged"
@@ -81,50 +105,41 @@
                     <ColumnDefinition Width="2*"/>
                 </Grid.ColumnDefinitions>
 
-                <Label Content="MgNr.:" HorizontalAlignment="Left" Margin="10,12,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="MgNrInput" IsReadOnly="True"
-                         HorizontalAlignment="Left" Margin="0,10,0,0" TextWrapping="NoWrap" VerticalAlignment="Top" Width="48" FontSize="14" Padding="2" Grid.Column="1" TextAlignment="Right"/>
+                <Label Content="MgNr.:" Margin="10,12,0,0" Grid.Column="0"/>
+                <TextBox x:Name="MgNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
 
-                <Label Content="Vorg.:" HorizontalAlignment="Left" Margin="10,12,0,0" VerticalAlignment="Top" Padding="2" Grid.Column="2"/>
-                <TextBox x:Name="PredecessorMgNrInput" IsReadOnly="True"
-                         HorizontalAlignment="Left" Margin="0,10,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" Width="48" FontSize="14" Padding="2" Grid.Column="3" TextAlignment="Right"/>
+                <Label Content="Vorg.:" Margin="10,12,0,0" Grid.Column="2"/>
+                <TextBox x:Name="PredecessorMgNrInput" Margin="0,10,10,0" Width="48" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"/>
 
-                <Label Content="Vorname:" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" Padding="2" Grid.Column="0"/>
-                <TextBox x:Name="GivenNameInput" IsReadOnly="True"
-                          TextChanged="TextBox_TextChanged"
-                         Margin="0,40,0,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1"/>
+                <Label Content="Vorname:" Margin="10,42,0,0" Grid.Column="0"/>
+                <TextBox x:Name="GivenNameInput" Margin="0,40,0,0" Grid.Column="1"
+                         TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Präfix:" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" Padding="2" Grid.Column="2"/>
-                <TextBox x:Name="PrefixInput" IsReadOnly="True"
-                         TextChanged="TextBox_TextChanged"
-                         Margin="0,40,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="3"/>
+                <Label Content="Präfix:" Margin="10,42,0,0" Grid.Column="2"/>
+                <TextBox x:Name="PrefixInput" Margin="0,40,10,0" Grid.Column="3"
+                         TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Nachname:" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top" Padding="2" Grid.Column="0"/>
-                <TextBox x:Name="FamilyNameInput" IsReadOnly="True"
-                         TextChanged="TextBox_TextChanged"
-                         Margin="0,70,0,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1"/>
+                <Label Content="Nachname:" Margin="10,72,0,0" Grid.Column="0"/>
+                <TextBox x:Name="FamilyNameInput" Margin="0,70,0,0" Grid.Column="1"
+                         TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Suffix:" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top" Padding="2" Grid.Column="2"/>
-                <TextBox x:Name="SuffixInput" IsReadOnly="True"
-                         TextChanged="TextBox_TextChanged"
-                         Margin="0,70,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="3"/>
+                <Label Content="Suffix:" Margin="10,72,0,0" Grid.Column="2"/>
+                <TextBox x:Name="SuffixInput" Margin="0,70,10,0" Grid.Column="3"
+                         TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Geburtstag:" HorizontalAlignment="Left" Margin="10,102,0,0" VerticalAlignment="Top" Padding="2" Grid.Column="0"/>
-                <TextBox x:Name="BirthdayInput" IsReadOnly="True"
-                            Grid.Column="1" TextWrapping="NoWrap" Margin="0,100,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="14" Padding="2" Height="25" Width="78" TextAlignment="Right"/>
+                <Label Content="Geburtstag:" Margin="10,102,0,0" Grid.Column="0"/>
+                <TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"/>
 
-                <Label Content="Adresse:" HorizontalAlignment="Left" Margin="10,132,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="AddressInput" IsReadOnly="True"
-                         TextChanged="TextBox_TextChanged"
-                         Margin="0,130,10,0" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Grid.ColumnSpan="3" Height="25"/>
+                <Label Content="Adresse:" Margin="10,132,0,0" Height="20"/>
+                <TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
+                         TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="PLZ/Ort:" HorizontalAlignment="Left" Margin="10,162,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="PlzInput" IsReadOnly="True"
-                         TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus"
-                         HorizontalAlignment="Left" Margin="0,160,0,0" VerticalAlignment="Top" Width="42" FontSize="14" Padding="2" Grid.Column="1" Height="25"/>
-                <ComboBox x:Name="OrtInput" ItemTemplate="{StaticResource PostalDestComboBoxTemplate}" IsEnabled="False"
+                <Label Content="PLZ/Ort:" Margin="10,162,0,0" Grid.Column="0"/>
+                <TextBox x:Name="PlzInput" Margin="0,160,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                         TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus"/>
+                <ComboBox x:Name="OrtInput" ItemTemplate="{StaticResource PostalDestComboBoxTemplate}" TextSearch.TextPath="Ort.Name"
                           SelectionChanged="ComboBox_SelectionChanged"
-                          Margin="47,160,10,0" VerticalAlignment="Top" FontSize="14" Grid.Column="1" Grid.ColumnSpan="3" Height="25"/>
+                          Margin="47,160,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
             </Grid>
         </GroupBox>
         <GroupBox Header="Kontaktdaten" Grid.Column="1" Grid.Row="3" Margin="5,5,5,5">
@@ -134,25 +149,21 @@
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
 
-                <Label Content="E-Mail-Adresse:" HorizontalAlignment="Left" Margin="10,12,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="EmailInput" IsReadOnly="True"
-                         TextChanged="EmailInput_TextChanged" LostFocus="EmailInput_LostFocus"
-                         Margin="0,10,10,0" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Height="25"/>
+                <Label Content="E-Mail-Adresse:" Margin="10,12,0,0" Grid.Column="0"/>
+                <TextBox x:Name="EmailInput" Margin="0,10,10,0" Grid.Column="1"
+                         TextChanged="EmailInput_TextChanged" LostFocus="EmailInput_LostFocus"/>
 
-                <Label Content="Tel.-Nr. (Festnetz):" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="PhoneLandlineInput" IsReadOnly="True"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"
-                         Margin="0,40,10,0" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Height="25"/>
+                <Label Content="Tel.-Nr. (Festnetz):" Margin="10,42,0,0" Grid.Column="0"/>
+                <TextBox x:Name="PhoneLandlineInput" Margin="0,40,10,0" Grid.Column="1"
+                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
 
-                <Label Content="Tel.-Nr. (mobil):" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="PhoneMobile1Input" IsReadOnly="True"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"
-                         Margin="0,70,10,0" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Height="25"/>
+                <Label Content="Tel.-Nr. (mobil):" Margin="10,72,0,0" Grid.Column="0"/>
+                <TextBox x:Name="PhoneMobile1Input" Margin="0,70,10,0" Grid.Column="1"
+                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
 
-                <Label Content="Tel.-Nr. (mobil):" HorizontalAlignment="Left" Margin="10,102,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="PhoneMobile2Input" IsReadOnly="True"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"
-                         Margin="0,100,10,0" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Height="25"/>
+                <Label Content="Tel.-Nr. (mobil):" Margin="10,102,0,0" Grid.Column="0"/>
+                <TextBox x:Name="PhoneMobile2Input" Margin="0,100,10,0" Grid.Column="1"
+                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
             </Grid>
         </GroupBox>
         <GroupBox Header="Bankverbindung" Grid.Column="1" Grid.Row="4" Margin="5,5,5,10">
@@ -162,15 +173,13 @@
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
 
-                <Label Content="IBAN:" HorizontalAlignment="Left" Margin="10,12,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="IbanInput" IsReadOnly="True"
-                         TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"
-                         Margin="0,10,10,0" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Height="25"/>
+                <Label Content="IBAN:" Margin="10,12,0,0" Grid.Column="0"/>
+                <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
+                         TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
 
-                <Label Content="BIC:" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="BicInput" IsReadOnly="True"
-                         TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"
-                         Margin="0,40,10,0" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Height="25"/>
+                <Label Content="BIC:" Margin="10,42,0,0" Grid.Column="0"/>
+                <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
+                         TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
             </Grid>
         </GroupBox>
         <GroupBox Header="Betrieb" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,5">
@@ -181,14 +190,12 @@
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
 
-                <Label Content="UID:" HorizontalAlignment="Left" Margin="10,12,0,0" VerticalAlignment="Top" Padding="2" Grid.Column="0"/>
-                <TextBox x:Name="UstIdInput" IsReadOnly="True"
-                         Margin="0,10,10,0" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Height="25" Width="120" HorizontalAlignment="Left"/>
+                <Label Content="UID:" Margin="10,12,0,0" Grid.Column="0"/>
+                <TextBox x:Name="UstIdInput" Margin="0,10,10,0" Grid.Column="1" Width="120" HorizontalAlignment="Left"/>
 
-                <Label Content="BetriebsNr.:" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="LfbisNrInput" IsReadOnly="True"
-                         TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"
-                         Margin="0,40,10,0" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Height="25" Width="64" HorizontalAlignment="Left" TextAlignment="Right"/>
+                <Label Content="BetriebsNr.:" Margin="10,42,0,0" Grid.Column="0"/>
+                <TextBox x:Name="LfbisNrInput" Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
+                         TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
                 <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsEnabled="False"
                           Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
@@ -202,23 +209,20 @@
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
 
-                <Label Content="Name:" HorizontalAlignment="Left" Margin="10,12,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="BillingName" IsReadOnly="True"
-                         TextChanged="TextBox_TextChanged"
-                         Margin="0,10,10,10" VerticalAlignment="Top" Grid.ColumnSpan="2" FontSize="14" Padding="2" Grid.Column="1"/>
+                <Label Content="Name:" Margin="10,12,0,0" Grid.Column="0"/>
+                <TextBox x:Name="BillingName" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
+                         TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Adresse:" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="BillingAddressInput" IsReadOnly="True"
-                         TextChanged="TextBox_TextChanged"
-                         Margin="0,40,10,0" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1"/>
+                <Label Content="Adresse:" Margin="10,42,0,0" Grid.Column="0"/>
+                <TextBox x:Name="BillingAddressInput" Margin="0,40,10,0" Grid.Column="1"
+                         TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="PLZ/Ort:" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="BillingPlzInput" IsReadOnly="True"
-                         TextChanged="BillingPlzInput_TextChanged" LostFocus="BillingPlzInput_LostFocus"
-                         HorizontalAlignment="Left" Margin="0,70,0,0" VerticalAlignment="Top" Width="42" FontSize="14" Padding="2" Grid.Column="1"/>
-                <ComboBox x:Name="BillingOrtInput" ItemTemplate="{StaticResource PostalDestComboBoxTemplate}" IsEnabled="False"
+                <Label Content="PLZ/Ort:" Margin="10,72,0,0" Grid.Column="0"/>
+                <TextBox x:Name="BillingPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                         TextChanged="BillingPlzInput_TextChanged" LostFocus="BillingPlzInput_LostFocus"/>
+                <ComboBox x:Name="BillingOrtInput" ItemTemplate="{StaticResource PostalDestComboBoxTemplate}" TextSearch.TextPath="Ort.Name"
                           SelectionChanged="ComboBox_SelectionChanged"
-                          Margin="47,70,10,0" VerticalAlignment="Top" FontSize="14" Grid.Column="1"/>
+                          Margin="47,70,10,0" Grid.Column="1"/>
             </Grid>
         </GroupBox>
         <GroupBox Header="Genossenschaft" Grid.Column="2" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,10">
@@ -229,22 +233,18 @@
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
 
-                <Label Content="Eintritt:" HorizontalAlignment="Left" Margin="10,12,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="EntryDateInput" IsReadOnly="True"
-                         Grid.Column="1" TextWrapping="NoWrap" Margin="0,10,10,0" VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="14" Padding="2" Height="25" Width="76" TextAlignment="Right"/>
+                <Label Content="Eintritt:" Margin="10,12,0,0" Grid.Column="0"/>
+                <TextBox x:Name="EntryDateInput" Margin="0,10,10,0" Width="76" Grid.Column="1" HorizontalAlignment="Left"  TextAlignment="Right"/>
 
-                <Label Content="Austritt:" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="ExitDateInput" IsReadOnly="True"
-                         Grid.Column="1" TextWrapping="NoWrap" Margin="0,40,10,0" VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="14" Padding="2" Height="25" Width="76" TextAlignment="Right"/>
+                <Label Content="Austritt:" Margin="10,42,0,0" Grid.Column="0"/>
+                <TextBox x:Name="ExitDateInput"  Margin="0,40,10,0" Width="76" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"/>
 
-                <Label Content="Geschäftsanteile:" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="BusinessSharesInput" IsReadOnly="True"
-                         HorizontalAlignment="Left" Margin="0,70,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" Width="48" FontSize="14" Padding="2" Grid.Column="1" TextAlignment="Right"/>
+                <Label Content="Geschäftsanteile:" Margin="10,72,0,0" Grid.Column="0"/>
+                <TextBox x:Name="BusinessSharesInput" Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left"  TextAlignment="Right"/>
 
-                <Label Content="BH-Konto:" HorizontalAlignment="Left" Margin="10,102,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="AccountingNrInput" IsReadOnly="True"
-                         TextChanged="TextBox_TextChanged"
-                         Margin="0,100,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1"/>
+                <Label Content="BH-Konto:" Margin="10,102,0,0" Grid.Column="0"/>
+                <TextBox x:Name="AccountingNrInput" Margin="0,100,10,0" Grid.Column="1"
+                         TextChanged="TextBox_TextChanged"/>
 
                 <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
                           Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
@@ -258,22 +258,21 @@
                           Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                           Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="StammZwst.:" HorizontalAlignment="Left" Margin="10,132,0,0" VerticalAlignment="Top" Padding="2"/>
-                <ComboBox x:Name="BranchInput" ItemTemplate="{StaticResource BranchTemplate}" IsEnabled="False"
+                <Label Content="StammZwst.:" Margin="10,132,0,0" Grid.Column="0"/>
+                <ComboBox x:Name="BranchInput" ItemTemplate="{StaticResource BranchTemplate}" TextSearch.TextPath="Name"
                           SelectionChanged="ComboBox_SelectionChanged"
-                          Margin="0,130,10,0" VerticalAlignment="Top" Grid.Column="1" FontSize="14" Height="25" Grid.ColumnSpan="2"/>
+                          Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-                <Label Content="Stammgemeinde:" HorizontalAlignment="Left" Margin="10,162,0,0" VerticalAlignment="Top" Padding="2"/>
-                <ComboBox x:Name="DefaultKgInput" ItemTemplate="{StaticResource KgTemplate}" IsEnabled="False"
+                <Label Content="Stammgemeinde:" Margin="10,162,0,0" Grid.Column="0"/>
+                <ComboBox x:Name="DefaultKgInput" ItemTemplate="{StaticResource KgTemplate}" TextSearch.TextPath="Name"
                           SelectionChanged="ComboBox_SelectionChanged"
-                          Margin="0,160,10,0" VerticalAlignment="Top" Grid.Column="1" FontSize="14" Height="25" Grid.ColumnSpan="2"/>
+                          Margin="0,160,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-                <Label Content="Anmerkung:" HorizontalAlignment="Left" Margin="10,192,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="CommentInput" IsReadOnly="True"
-                         TextChanged="TextBox_TextChanged"
-                         Margin="0,190,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Grid.ColumnSpan="2" TextAlignment="Right"/>
+                <Label Content="Anmerkung:" Margin="10,192,0,0" Grid.Column="0"/>
+                <TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2" TextAlignment="Right"
+                         TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Kontaktart:" HorizontalAlignment="Left" Margin="10,222,0,0" VerticalAlignment="Top" Padding="2"/>
+                <Label Content="Kontaktart:" Margin="10,222,0,0" Grid.Column="0"/>
                 <RadioButton x:Name="ContactPostInput" GroupName="DefaultContact" Content="Post" IsEnabled="False"
                              Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"
                              HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>