diff --git a/ZKuP/MainWindow.xaml b/ZKuP/MainWindow.xaml
index 8e8ee41..d4fa3e4 100644
--- a/ZKuP/MainWindow.xaml
+++ b/ZKuP/MainWindow.xaml
@@ -7,15 +7,15 @@
         xmlns:local="clr-namespace:ZKuP"
         xmlns:gif="https://github.com/XamlAnimatedGif/XamlAnimatedGif"
         xmlns:p="clr-namespace:ZKuP.Properties"
-        mc:Ignorable="d"
+        mc:Ignorable="d"      
         
-        Title="{Binding Version, StringFormat=ZKuP - {0:0}, Mode=OneWay, RelativeSource={RelativeSource Mode=Self}}" 
-  
-                 WindowStartupLocation="CenterScreen"
-        MinHeight="675"
-        MinWidth="1680"
-        Closing="Window_Closing"
-        PreviewKeyDown="Window_PreviewKeyDown" Loaded="Window_Loaded" ContentRendered="Window_ContentRendered" SizeChanged="Window_SizeChanged" LocationChanged="MetroWindow_LocationChanged" StateChanged="MetroWindow_StateChanged" DpiChanged="MetroWindow_DpiChanged" 
+                 Title="{Binding Version, StringFormat=ZKuP - {0:0}, Mode=OneWay, RelativeSource={RelativeSource Mode=Self}}"   
+                 WindowStartupLocation="CenterScreen"        
+                 MinHeight="675"        
+                 MinWidth="1680"        
+                 Height="300"
+                 Width="1200"
+                 Closing="Window_Closing" PreviewKeyDown="Window_PreviewKeyDown" Loaded="Window_Loaded" ContentRendered="Window_ContentRendered" SizeChanged="Window_SizeChanged" LocationChanged="MetroWindow_LocationChanged" StateChanged="MetroWindow_StateChanged" DpiChanged="MetroWindow_DpiChanged"  
         >
     <!--Height="{Binding Source={x:Static p:Settings.Default}, Path=Height, Mode=TwoWay, FallbackValue=747}"
         Width="{Binding Source={x:Static p:Settings.Default}, Path=Width, Mode=TwoWay, FallbackValue=1624}"
@@ -1035,35 +1035,41 @@
         
         
         
-            <Border x:Name="canvasSettings" Margin="0" BorderThickness="1" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" CornerRadius="10" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" Visibility="Collapsed" Width="430" Height="400" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.RowSpan="3">
+            <Border x:Name="canvasSettings" Margin="0" BorderThickness="1" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" CornerRadius="10" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" Visibility="Collapsed" Width="500" Height="600" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.RowSpan="3">
             <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition Height="200"/>
+                        <RowDefinition Height="200"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
                 <!--<Border BorderBrush="Gray" BorderThickness="2" Width="400" Height="364"/>-->
-                <CheckBox x:Name="cbShowParkcardToAccept" Content="Meldung 'Es sind Parkkarten zu Genehmigen vorhanden' anzeigen?" Margin="10,20,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Checked="cbShowParkcardToAccept_Checked" Unchecked="cbShowParkcardToAccept_Unchecked"/>
-                <CheckBox x:Name="cbShowParkcardToPrint" Content="Meldung 'Es sind Parkkarten zum drucken vorhanden' anzeigen?" Margin="10,50,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Checked="cbShowParkcardToPrint_Checked" Unchecked="cbShowParkcardToPrint_Unchecked"/>
+                <CheckBox x:Name="cbShowParkcardToAccept" Content="Meldung 'Es sind Parkkarten zu Genehmigen vorhanden' anzeigen?" Grid.Row="0" Margin="10,20,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Checked="cbShowParkcardToAccept_Checked" Unchecked="cbShowParkcardToAccept_Unchecked"/>
+                    <CheckBox x:Name="cbShowParkcardToPrint" Content="Meldung 'Es sind Parkkarten zum drucken vorhanden' anzeigen?" Grid.Row="0" Margin="10,50,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Checked="cbShowParkcardToPrint_Checked" Unchecked="cbShowParkcardToPrint_Unchecked"/>
 
-                <TextBlock Text="Parkkarten-Benachrichtigung:" Margin="10,85"/>
+                    <TextBlock Text="Parkkarten-Benachrichtigung:" Margin="10,0" VerticalAlignment="Top" Grid.Row="1"/>
 
-                <DataGrid x:Name="dgParkEmailUsers" IsReadOnly="True" AutoGenerateColumns="False" ItemsSource="{Binding ParkEmailUsers}" Width="350" Height="120" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" Margin="10,110,10,30"  VerticalAlignment="Top" HorizontalAlignment="Left">
+                    <DataGrid x:Name="dgParkEmailUsers" IsReadOnly="True" Grid.Row="1" AutoGenerateColumns="False" ItemsSource="{Binding ParkEmailUsers}" Width="430" Height="120" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" Margin="10,0,10,0"  VerticalAlignment="Top" HorizontalAlignment="Left">
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="ID" Binding="{Binding idparkEmailUsers}"/>
-                        <DataGridTextColumn Header="Name" Binding="{Binding Name}"/>
-                        <DataGridTextColumn Header="Email" Binding="{Binding Email}"/>
+                        <DataGridTextColumn Header="ID" Binding="{Binding idparkEmailUsers}" Width="34"/>
+                        <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="*"/>
+                            <DataGridTextColumn Header="Email" Binding="{Binding Email}" Width="2*"/>
                     </DataGrid.Columns>
                 </DataGrid>
-                <Button x:Name="btnAddParkEmailUser" Content="" FontFamily="Segoe UI Symbol" Width="40" Height="40" Padding="0" ToolTip="Email-Empfänger hinzufügen" Margin="10,120" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnAddParkEmailUser_Click"/>
-                <Button x:Name="btnDelParkEmailUser" Content="" FontFamily="Segoe UI Symbol" Width="40" Height="40" Padding="0" ToolTip="Email-Empfänger entfernen" Margin="10,170" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnDelParkEmailUser_Click"/>
+                    <Button x:Name="btnAddParkEmailUser" Content="" FontFamily="Segoe UI Symbol" Grid.Row="1" Width="40" Height="40" Padding="0" ToolTip="Email-Empfänger hinzufügen" Margin="10,0" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnAddParkEmailUser_Click"/>
+                    <Button x:Name="btnDelParkEmailUser" Content="" FontFamily="Segoe UI Symbol" Grid.Row="1" Width="40" Height="40" Padding="0" ToolTip="Email-Empfänger entfernen" Margin="10,50" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnDelParkEmailUser_Click"/>
 
-                <TextBlock Text="Fahrzeuganmeldungen-Benachrichtung:" Margin="10,215,0,0"/>
+                    <TextBlock Text="Fahrzeuganmeldungen-Benachrichtung:" Margin="10,0,0,0" Grid.Row="2"/>
 
-                <DataGrid x:Name="dgFzgAnmeldungUsers" IsReadOnly="True" AutoGenerateColumns="False" ItemsSource="{Binding FzgAnmeldungUsers}" Width="350" Height="140" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" Margin="10,240,10,30"  VerticalAlignment="Top" HorizontalAlignment="Left">
+                    <DataGrid x:Name="dgFzgAnmeldungUsers" IsReadOnly="True" Grid.Row="2" AutoGenerateColumns="False" ItemsSource="{Binding FzgAnmeldungUsers}" Width="430" Height="140" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" Margin="10,0,10,0"  VerticalAlignment="Top" HorizontalAlignment="Left">
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="ID" Binding="{Binding idfzgAnmeldungEmail}"/>
-                        <DataGridTextColumn Header="Name" Binding="{Binding Name}"/>
-                        <DataGridTextColumn Header="Email" Binding="{Binding Email}"/>
+                            <DataGridTextColumn Header="ID" Binding="{Binding idfzgAnmeldungEmail}" Width="34"/>
+                            <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="*"/>
+                            <DataGridTextColumn Header="Email" Binding="{Binding Email}" Width="2*"/>
                     </DataGrid.Columns>
                 </DataGrid>
-                <Button x:Name="btnAddFzgAnmeldungUser" Content="" FontFamily="Segoe UI Symbol" Width="40" Height="40" Padding="0" ToolTip="Email-Empfänger hinzufügen" Margin="10,240,10,0" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnAddFzgAnmeldungUser_Click"/>
-                <Button x:Name="btnDelFzgAnmeldungUser" Content="" FontFamily="Segoe UI Symbol" Width="40" Height="40" Padding="0" ToolTip="Email-Empfänger entfernen" Margin="10,290,10,0" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnDelFzgAnmeldungUser_Click"/>
+                    <Button x:Name="btnAddFzgAnmeldungUser" Content="" Grid.Row="2" FontFamily="Segoe UI Symbol" Width="40" Height="40" Padding="0" ToolTip="Email-Empfänger hinzufügen" Margin="10,0,10,0" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnAddFzgAnmeldungUser_Click"/>
+                    <Button x:Name="btnDelFzgAnmeldungUser" Content="" Grid.Row="2" FontFamily="Segoe UI Symbol" Width="40" Height="40" Padding="0" ToolTip="Email-Empfänger entfernen" Margin="10,50,10,0" VerticalAlignment="Top" HorizontalAlignment="Right" Click="btnDelFzgAnmeldungUser_Click"/>
 
 
                 <Popup x:Name="cm" AllowsTransparency="True" StaysOpen="False" Placement="MousePoint">
@@ -1105,7 +1111,7 @@
                     </Border>
                 </Popup>
 
-                <Button x:Name="btnCloseSettings" Content="Schließen" Margin="10" Width="100" Height="29" Click="btnCloseSettings_Click" HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
+                    <Button x:Name="btnCloseSettings" Content="Schließen" Margin="10" Grid.Row="3" Width="100" Height="29" Click="btnCloseSettings_Click" HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
             </Grid>
         </Border>
 
diff --git a/ZKuP/MainWindow.xaml.cs b/ZKuP/MainWindow.xaml.cs
index 435e54b..efba8cc 100644
--- a/ZKuP/MainWindow.xaml.cs
+++ b/ZKuP/MainWindow.xaml.cs
@@ -285,7 +285,7 @@ namespace ZKuP
             }
         }
 
-        private async void CheckMaintenance()
+        private async Task CheckMaintenance()
         {
             var path = @"\\mhb00swfs003v.fv-werke.db.de\GLW99\ZKuP\Maintenance.txt";
 
diff --git a/ZKuP/SQL.cs b/ZKuP/SQL.cs
index 88e50c9..7fef34c 100644
--- a/ZKuP/SQL.cs
+++ b/ZKuP/SQL.cs
@@ -26,7 +26,7 @@ namespace ZKuP
     public static class SQL
     {
         private static string p = "fNZG8bO+b8lbajxNUCPCIRNBap4/T5N5Qoa0Rec3P9b2EiwC5eNIwfEMjR5Fvc/W";
-        private static string s = "d0cRVbko84WkycpOfE30db5kQvnIprtdeNhhB6BtCdg=";     // "KYgjkRVn0edFDca2GbZq/A=="; old server
+        private static string s = "d4a9bSblcbk2OdoAsLye0w==";     // "KYgjkRVn0edFDca2GbZq/A=="; old server
         private static string uSSL = "miSRZrFLxAAWlzRLx9B6Ww==";
         private static string d = "xWb4X9gPEzwe76zqpysF3w==";
 #if DEBUG