diff --git a/Elwig/Elwig.csproj b/Elwig/Elwig.csproj
index 2ebd116..2984920 100644
--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@@ -28,6 +28,10 @@
     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Resource Include="elwig.png" />
+  </ItemGroup>
+
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="call fetch-resources.bat" />
   </Target>
diff --git a/Elwig/Windows/MainWindow.xaml b/Elwig/Windows/MainWindow.xaml
index 540c480..b153df6 100644
--- a/Elwig/Windows/MainWindow.xaml
+++ b/Elwig/Windows/MainWindow.xaml
@@ -7,9 +7,35 @@
         mc:Ignorable="d"
         Title="Elwig" Height="450" Width="800" ResizeMode="CanResize" SizeToContent="Manual"
         Loaded="Window_Loaded">
+    <Window.Resources>
+        <Style TargetType="Button">
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="27"/>
+            <Setter Property="Width" Value="200"/>
+        </Style>
+    </Window.Resources>
     <Grid>
-        <Button x:Name="Button2" Content="Mitgliederverwaltung" Margin="472,182,178,0" VerticalAlignment="Top" Click="Button2_Click"/>
-        <Button x:Name="Button3" Content="Mitgliederliste" Margin="472,217,178,0" VerticalAlignment="Top" Click="Button3_Click"/>
-        <Button x:Name="Button4" Content="Generate" Margin="425,300,225,0" VerticalAlignment="Top" Click="Button4_Click" Tag="Print"/>
+        <Grid Height="100" VerticalAlignment="Top">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Image Source="/elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Grid.Column="0"
+                   HorizontalAlignment="Left" Margin="5,5,5,5" VerticalAlignment="Top"/>
+            <Label Grid.Column="1" Content="Elwig" FontSize="32"
+                   HorizontalAlignment="Left" Margin="0,10,0,0" VerticalAlignment="Top"/>
+            <Label Grid.Column="1" Content="Elektonische Winzer-"
+                   HorizontalAlignment="Left" Margin="0,55,0,0" VerticalAlignment="Top"/>
+            <Label Grid.Column="1" Content="genossenschaftsverwaltung"
+                   HorizontalAlignment="Left" Margin="0,70,0,0" VerticalAlignment="Top"/>
+        </Grid>
+
+        <Button x:Name="Button2" Content="Mitgliederverwaltung" Click="Button2_Click"
+                Margin="50,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+        <Button x:Name="Button3" Content="Mitgliederliste" Click="Button3_Click"
+                Margin="50,200,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+        <Button x:Name="Button4" Content="PDF Erzeugen" Click="Button4_Click" Tag="Print"
+                Margin="50,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
     </Grid>
 </Window>
diff --git a/Elwig/Windows/MainWindow.xaml.cs b/Elwig/Windows/MainWindow.xaml.cs
index 0b453b4..8ea3137 100644
--- a/Elwig/Windows/MainWindow.xaml.cs
+++ b/Elwig/Windows/MainWindow.xaml.cs
@@ -6,7 +6,6 @@ using Elwig.Helpers;
 
 namespace Elwig.Windows {
     public partial class MainWindow : Window {
-        private readonly AppDbContext Context = new();
 
         public MainWindow() {
             InitializeComponent();
@@ -16,11 +15,6 @@ namespace Elwig.Windows {
             Button4.IsEnabled = App.IsPrintingReady;
         }
 
-        protected override void OnClosing(CancelEventArgs evt) {
-            Context.Dispose();
-            base.OnClosing(evt);
-        }
-
         private void Button2_Click(object sender, RoutedEventArgs evt) {
             var w = new MemberAdminWindow();
             w.Show();
@@ -33,7 +27,8 @@ namespace Elwig.Windows {
 
         private void Button4_Click(object sender, RoutedEventArgs evt) {
             Utils.RunBackground("PDF Generation", async () => {
-                using var doc = new DeliveryNote(Context.Deliveries.OrderBy(d => d.Year).ThenBy(d => d.DId).Last());
+                using var ctx = new AppDbContext();
+                using var doc = new DeliveryNote(ctx.Deliveries.OrderBy(d => d.Parts.Count).ThenBy(d => d.Year).ThenBy(d => d.DId).Last());
                 await doc.Generate();
                 doc.Show();
             });
diff --git a/Elwig/elwig.png b/Elwig/elwig.png
new file mode 100644
index 0000000..f2764a2
Binary files /dev/null and b/Elwig/elwig.png differ