diff --git a/ZKuP/ManageAsp.xaml b/ZKuP/ManageAsp.xaml
index 48359b8..6076710 100644
--- a/ZKuP/ManageAsp.xaml
+++ b/ZKuP/ManageAsp.xaml
@@ -6,10 +6,25 @@
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
         xmlns:local="clr-namespace:ZKuP"
         mc:Ignorable="d"
-        Title="Ansprechpartner verwalten" Height="450" Width="1080"
-        WindowStartupLocation="CenterScreen" MinHeight="450" MinWidth="1080">
+        Title="Ansprechpartner verwalten" Height="450" Width="1180"
+        WindowStartupLocation="CenterScreen" MinHeight="450" MinWidth="1180">
     <Grid>
-        <DataGrid x:Name="dgAsp" Margin="305,10,7,52" ItemsSource="{Binding Path=., Mode=OneWay}" ToolTip="Einträge können mit Doppelklick auf die Zelle geändert werden" CanUserAddRows="False" AutoGenerateColumns="False" CanUserReorderColumns="False" PreviewKeyDown="DgAsp_PreviewKeyDown" CellEditEnding="DgAsp_CellEditEnding" BeginningEdit="DgAsp_BeginningEdit">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="230"/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+
+
+        <DataGrid x:Name="dgAsp" Grid.RowSpan="7" Grid.Column="1" Margin="90,10,7,52" ItemsSource="{Binding Path=., Mode=OneWay}" ToolTip="Einträge können mit Doppelklick auf die Zelle geändert werden" CanUserAddRows="False" AutoGenerateColumns="False" CanUserReorderColumns="False" PreviewKeyDown="DgAsp_PreviewKeyDown" CellEditEnding="DgAsp_CellEditEnding" BeginningEdit="DgAsp_BeginningEdit">
             <DataGrid.Columns>
                 <DataGridTextColumn Binding="{Binding Name}" ClipboardContentBinding="{x:Null}" Header="Ansprechpartner" Width="*"/>
                 <DataGridTextColumn Binding="{Binding Vertreter}" ClipboardContentBinding="{x:Null}" Header="Asp-Vertreter" Width="*"/>
@@ -17,6 +32,7 @@
                 <DataGridTextColumn Binding="{Binding Tel_Nr}" ClipboardContentBinding="{x:Null}" Header="Asp-Tel" Width="*"/>
                 <DataGridTextColumn Binding="{Binding Tel_Vertreter}" ClipboardContentBinding="{x:Null}" Header="Vertreter-Tel" Width="*"/>
                 <DataGridTextColumn Binding="{Binding Tel_Vorgesetzter}" ClipboardContentBinding="{x:Null}" Header="Vorgesetzter-Tel" Width="*"/>
+                <DataGridTextColumn Binding="{Binding Raum}" ClipboardContentBinding="{x:Null}" Header="Raum/Werkstatt" Width="*" DisplayIndex="1"/>
                 <DataGridTemplateColumn>
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
@@ -26,19 +42,43 @@
                 </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
-        <TextBox x:Name="tbAsp" HorizontalAlignment="Left" Height="25" Margin="10,50,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" Padding="0,2,0,0" TabIndex="1"/>
-        <TextBox x:Name="tbAspVertreter" HorizontalAlignment="Left" Height="25" Margin="10,105,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" Padding="0,2,0,0" TabIndex="2"/>
-        <TextBox x:Name="tbAspVorgesetzter" HorizontalAlignment="Left" Height="25" Margin="10,165,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" Padding="0,2,0,0" TabIndex="3"/>
-        <Button x:Name="btnCreateAsp" Margin="230,10,0,52" FontSize="12" Padding="-2" Content="Hinzufügen&#xD;&#xA;       →" Click="BtnCreateAsp_Click" HorizontalAlignment="Left" Width="70" TabIndex="7"/>
-        <TextBox x:Name="tbAspTel" HorizontalAlignment="Left" Height="23" Margin="10,227,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" TabIndex="4"/>
-        <TextBlock HorizontalAlignment="Left" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,29,0,0" TextWrapping="Wrap" Text="Ansprechpartner:" VerticalAlignment="Top" Width="110"/>
-        <TextBlock HorizontalAlignment="Left" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,84,0,0" TextWrapping="Wrap" Text="Ansprechpartner-Vertreter:" VerticalAlignment="Top" Width="155"/>
-        <TextBlock HorizontalAlignment="Left" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,144,0,0" TextWrapping="Wrap" Text="Ansprechpartner-Vorgesetzter:" VerticalAlignment="Top" Width="175"/>
-        <TextBlock HorizontalAlignment="Left" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,206,0,0" TextWrapping="Wrap" Text="Ansprechpartner-TelNr:" VerticalAlignment="Top" Width="155"/>
-        <TextBox x:Name="tbVertreterTel" HorizontalAlignment="Left" Height="25" Margin="10,289,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" Padding="0,2,0,0" TabIndex="5"/>
-        <TextBox x:Name="tbVorgesetzterTel" HorizontalAlignment="Left" Height="23" Margin="10,351,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" TabIndex="6"/>
-        <TextBlock HorizontalAlignment="Left" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,268,0,0" TextWrapping="Wrap" Text="Vertreter-TelNr:" VerticalAlignment="Top" Width="175"/>
-        <TextBlock HorizontalAlignment="Left" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,330,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="155"><Run Text="Vorgesetzter"/><Run Text="-TelNr:"/></TextBlock>
-        <Button x:Name="btnClose" Content="Schließen" Margin="0,0,10,10" TabIndex="8" Width="98" Height="28" HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="BtnClose_Click"/>
+        
+        <StackPanel Grid.Row="0" Margin="0,10,0,0">
+            <TextBlock HorizontalAlignment="Left" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Grid.Row="0" Margin="10,0,0,0" TextWrapping="Wrap" Text="Ansprechpartner:" VerticalAlignment="Top" Width="110"/>
+            <TextBox x:Name="tbAsp" Grid.Row="0" HorizontalAlignment="Left" Height="25" Margin="10,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" Padding="0,2,0,0" TabIndex="1"/>
+        </StackPanel>
+
+        <StackPanel Grid.Row="1">
+            <TextBlock HorizontalAlignment="Left" Grid.Row="1" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,0,0,0" TextWrapping="Wrap" Text="Raum/Werkstatt:" VerticalAlignment="Top" Width="155"/>
+            <TextBox x:Name="tbRaum" Grid.Row="1" HorizontalAlignment="Left" Height="25" Margin="10,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" Padding="0,2,0,0" TabIndex="2"/>
+        </StackPanel>
+
+        <StackPanel Grid.Row="2">
+            <TextBlock HorizontalAlignment="Left" Grid.Row="2" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,0,0,0" TextWrapping="Wrap" Text="Ansprechpartner-Vertreter:" VerticalAlignment="Top" Width="155"/>
+            <TextBox x:Name="tbAspVertreter" Grid.Row="2" HorizontalAlignment="Left" Height="25" Margin="10,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" Padding="0,2,0,0" TabIndex="3"/>
+        </StackPanel>
+
+        <StackPanel Grid.Row="3">
+            <TextBlock HorizontalAlignment="Left" Grid.Row="3" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,0,0,0" TextWrapping="Wrap" Text="Ansprechpartner-Vorgesetzter:" VerticalAlignment="Top" Width="175"/>
+            <TextBox x:Name="tbAspVorgesetzter" Grid.Row="3" HorizontalAlignment="Left" Height="25" Margin="10,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" Padding="0,2,0,0" TabIndex="4"/>
+        </StackPanel>
+
+        <StackPanel Grid.Row="4">
+            <TextBlock HorizontalAlignment="Left" Grid.Row="4" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,0,0,0" TextWrapping="Wrap" Text="Ansprechpartner-TelNr:" VerticalAlignment="Top" Width="155"/>
+            <TextBox x:Name="tbAspTel" HorizontalAlignment="Left" Grid.Row="4" Height="23" Margin="10,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" TabIndex="5"/>
+        </StackPanel>
+
+        <StackPanel Grid.Row="5">
+            <TextBlock HorizontalAlignment="Left" Grid.Row="5" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,0,0,0" TextWrapping="Wrap" Text="Vertreter-TelNr:" VerticalAlignment="Top" Width="175"/>
+            <TextBox x:Name="tbVertreterTel" Grid.Row="5" HorizontalAlignment="Left" Height="25" Margin="10,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" Padding="0,2,0,0" TabIndex="6"/>
+        </StackPanel>
+
+        <StackPanel Grid.Row="6">
+            <TextBlock HorizontalAlignment="Left" Grid.Row="6" Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" Margin="10,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="155"><Run Text="Vorgesetzter"/><Run Text="-TelNr:"/></TextBlock>
+            <TextBox x:Name="tbVorgesetzterTel" Grid.Row="6" HorizontalAlignment="Left" Height="23" Margin="10,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="215" TabIndex="7"/>
+        </StackPanel>
+
+        <Button x:Name="btnCreateAsp" Margin="10,10,0,10" Grid.RowSpan="7" FontSize="12" Padding="-2" Grid.Column="1" Content="Hinzufügen&#xD;&#xA;       →" Click="BtnCreateAsp_Click" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="70" TabIndex="8"/>
+        <Button x:Name="btnClose" Grid.Column="1" Grid.Row="7" Content="Schließen" Margin="0,0,10,10" TabIndex="8" Width="98" Height="28" HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="BtnClose_Click"/>
     </Grid>
 </mah:MetroWindow>
diff --git a/ZKuP/ManageAsp.xaml.cs b/ZKuP/ManageAsp.xaml.cs
index 06df11d..791cb91 100644
--- a/ZKuP/ManageAsp.xaml.cs
+++ b/ZKuP/ManageAsp.xaml.cs
@@ -71,6 +71,8 @@ namespace ZKuP
                 MessageBox.Show(this, "Ansprechpartner muss qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             else if (string.IsNullOrWhiteSpace(tbAspVertreter.Text) || tbAspVertreter.Text.ToList<char>().Distinct().Count() < 5)
                 MessageBox.Show(this, "Vertreter muss qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            else if (string.IsNullOrWhiteSpace(tbRaum.Text) || tbRaum.Text.ToList<char>().Distinct().Count() < 5)
+                MessageBox.Show(this, "Raum/Werkstatt qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             else if (string.IsNullOrWhiteSpace(tbAspVorgesetzter.Text) || tbAspVorgesetzter.Text.ToList<char>().Distinct().Count() < 5)
                 MessageBox.Show(this, "Vorgesetzter muss qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             else if (string.IsNullOrWhiteSpace(tbAspTel.Text) || !System.Text.RegularExpressions.Regex.IsMatch(tbAspTel.Text, "^[0-9()+\\-/ ]*$") || tbAspTel.Text.ToList<char>().Distinct().Count() < 5)
@@ -144,7 +146,9 @@ namespace ZKuP
                 case "Vorgesetzter-Tel":
                     await SQL.WriteSQL($"UPDATE {MainWindow.table}.ansprechpartner SET Tel_Vorgesetzter = '{newValue}', CreatorID = '{UserID}' WHERE Name = '{name}'");
                     break;
-
+                case "Raum/Werkstatt":
+                    await SQL.WriteSQL($"UPDATE {MainWindow.table}.ansprechpartner SET Raum = '{newValue}', CreatorID = '{UserID}' WHERE Name = '{name}'");
+                    break;
             }
 
             dgAsp.RowValidationErrorTemplate = new ControlTemplate();