diff --git a/AidA/View/MainController.cs b/AidA/View/MainController.cs
index a768b25..992d202 100644
--- a/AidA/View/MainController.cs
+++ b/AidA/View/MainController.cs
@@ -34,7 +34,7 @@ namespace AidA.View
                 LoginWindow.Hide();
 
                 MainWindow = new MainWindow();
-                MainWindow.ShowDialog();
+                MainWindow.Show();
             }
             catch (Exception ex)
             {
@@ -103,5 +103,11 @@ namespace AidA.View
             var dateiname = dbBackupVerzeichnis + "AidA_DB_Backup_" + String.Format("{0:yyyyMMdd HHmm}", DateTime.Now) + ".bak";
             Database.DbSichern(dateiname);
         }
+
+        public static void AnwendungSchliessen()
+        {
+            LoginWindow.Close();
+            Application.Current.Shutdown();
+        }
     }
 }
diff --git a/AidA/View/MainWindow.xaml b/AidA/View/MainWindow.xaml
index 4be9223..bfdcdb1 100644
--- a/AidA/View/MainWindow.xaml
+++ b/AidA/View/MainWindow.xaml
@@ -6,14 +6,15 @@
         xmlns:local="clr-namespace:AidA"
         xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxn="http://schemas.devexpress.com/winfx/2008/xaml/navbar" x:Class="AidA.MainWindow"
         mc:Ignorable="d"
-        Title="AidA Administration" Height="973" Width="1607" MinWidth="1603" MinHeight="973" ResizeMode="NoResize">
+        Title="AidA Administration" Height="973" Width="1607" MinWidth="1603" MinHeight="973" ResizeMode="NoResize" Closing="Window_Closing">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="383*"/>
-            <ColumnDefinition Width="415*"/>
+            <ColumnDefinition Width="768*"/>
+            <ColumnDefinition Width="652*"/>
+            <ColumnDefinition Width="181*"/>
         </Grid.ColumnDefinitions>
-        <Image HorizontalAlignment="Left" Height="100" Margin="719.5,10,0,0" VerticalAlignment="Top" Width="100" Source="DAS-Logo.png" Grid.Column="1"/>
-        <dxg:GridControl x:Name="MainGridControl" AutoGenerateColumns="AddNew" EnableSmartColumnsGeneration="True" HorizontalAlignment="Left" Height="712" Margin="5,115,0,0" VerticalAlignment="Top" Width="1578" Grid.ColumnSpan="2">
+        <Image HorizontalAlignment="Left" Height="100" Margin="68,10,0,0" VerticalAlignment="Top" Width="100" Source="DAS-Logo.png" Grid.Column="2"/>
+        <dxg:GridControl x:Name="MainGridControl" AutoGenerateColumns="AddNew" EnableSmartColumnsGeneration="True" HorizontalAlignment="Left" Height="712" Margin="5,115,0,0" VerticalAlignment="Top" Width="1578" Grid.ColumnSpan="3">
             <dxg:GridControl.View>
                 <dxg:TableView x:Name="MainTableView" ShowTotalSummary="True" AllowBestFit="True" BestFitMode="Smart" AutoWidth="True" Loaded="MainTableView_Loaded" AllowEditing="True" Margin="0,0,-2,0">
                     <dxg:TableView.RuntimeLocalizationStrings>
@@ -38,7 +39,7 @@
         <dx:SimpleButton Content="KontaktInfos" HorizontalAlignment="Left" Height="73" Margin="240,846,0,0" VerticalAlignment="Top" Width="96" Click="KontaktInfos_Click" GlyphAlignment="Top" Glyph="{dx:DXImage SvgImages/Business Objects/BO_Phone.svg}" Grid.Column="1"/>
         <dx:SimpleButton Content="FinanzTransaktionen" HorizontalAlignment="Left" Height="73" Margin="341,846,0,0" VerticalAlignment="Top" Width="130" Click="FinanzTransaktionen_Click" GlyphAlignment="Top" Glyph="{dx:DXImage SvgImages/Outlook Inspired/IndentIncrease.svg}" Grid.Column="1"/>
         <dx:SimpleButton Content="ZahlungenSEPA" HorizontalAlignment="Left" Height="73" Margin="476,846,0,0" VerticalAlignment="Top" Width="110" Click="ZahlungenSEPA_Click" GlyphAlignment="Top" Glyph="{dx:DXImage SvgImages/Spreadsheet/AccountingNumberFormat.svg}" Grid.Column="1"/>
-        <dx:SimpleButton Content="Kommunikationen" HorizontalAlignment="Left" Height="73" Margin="591,846,0,0" VerticalAlignment="Top" Width="118" Click="Kommunikationen_Click" GlyphAlignment="Top" Glyph="{dx:DXImage SvgImages/Business Objects/BO_List.svg}" Grid.Column="1"/>
-        <dx:SimpleButton Content="Mitarbeiter" HorizontalAlignment="Left" Height="73" Margin="714,846,0,0" VerticalAlignment="Top" Width="88" Click="Mitarbeiter_Click" GlyphAlignment="Top" Grid.Column="1" Glyph="{dx:DXImage SvgImages/Icon Builder/Business_Businesswoman.svg}"/>
+        <dx:SimpleButton Content="Kommunikationen" HorizontalAlignment="Left" Height="73" Margin="591,846,0,0" VerticalAlignment="Top" Width="118" Click="Kommunikationen_Click" GlyphAlignment="Top" Glyph="{dx:DXImage SvgImages/Business Objects/BO_List.svg}" Grid.Column="1" Grid.ColumnSpan="2"/>
+        <dx:SimpleButton Content="Mitarbeiter" HorizontalAlignment="Left" Height="73" Margin="62,846,0,0" VerticalAlignment="Top" Width="88" Click="Mitarbeiter_Click" GlyphAlignment="Top" Grid.Column="2" Glyph="{dx:DXImage SvgImages/Icon Builder/Business_Businesswoman.svg}"/>
     </Grid>
 </Window>
diff --git a/AidA/View/MainWindow.xaml.cs b/AidA/View/MainWindow.xaml.cs
index 9a9187f..a09f4dc 100644
--- a/AidA/View/MainWindow.xaml.cs
+++ b/AidA/View/MainWindow.xaml.cs
@@ -125,5 +125,10 @@ namespace AidA
         {
             MainController.DatenbankSichern();
         }
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            MainController.AnwendungSchliessen();
+        }
     }
 }