diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml
index ba09328..5f5cb8b 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@@ -356,14 +356,14 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Margin="5,5,5,5">
+            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="100"/>
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Lieferschein-Nr.:" Margin="10,10,0,0" Grid.Column="0"/>
                     <TextBox x:Name="LsNrInput" Text="{Binding LsNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
                              IsReadOnly="True" IsTabStop="False"
@@ -390,6 +390,37 @@
                     <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              Grid.Column="1" Margin="0,100,10,10"
                              TextChanged="TextBox_TextChanged"/>
+
+                    <Grid Grid.ColumnSpan="2" Margin="0,130,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
+                                 SelectionChanged="DeliveryPartList_SelectionChanged">
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{Binding DPNr}" Width="20"/>
+                                        <TextBlock Text="{Binding SortId}" Width="30"/>
+                                        <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
+                                        <TextBlock Text="{Binding QualId}" Width="30"/>
+                                        <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
+                                        <TextBlock Text="{Binding Attribute.Name}" Width="60"/>
+                                        <TextBlock Text="{Binding Cultivation.Name}" Width="50"/>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+
+                        <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
+                                ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
+                                HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
+                                Click="ExtractDeliveryPartButton_Click"/>
+                        <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
+                                HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
+                                Click="DeleteDeliveryPartButton_Click"/>
+                    </Grid>
                 </Grid>
             </GroupBox>
 
@@ -538,39 +569,6 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Teillieferungen" Grid.Column="0" Grid.Row="2" Margin="5,5,5,5">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-                    <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
-                             SelectionChanged="DeliveryPartList_SelectionChanged">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding DPNr}" Width="20"/>
-                                    <TextBlock Text="{Binding SortId}" Width="30"/>
-                                    <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
-                                    <TextBlock Text="{Binding QualId}" Width="30"/>
-                                    <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
-                                    <TextBlock Text="{Binding Attribute.Name}" Width="60"/>
-                                    <TextBlock Text="{Binding Cultivation.Name}" Width="50"/>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-
-                    <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
-                            ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
-                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
-                            Click="ExtractDeliveryPartButton_Click"/>
-                    <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
-                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
-                            Click="DeleteDeliveryPartButton_Click"/>
-                </Grid>
-            </GroupBox>
-
             <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="3" Margin="5,5,5,10">
                 <Grid>
                     <Grid.ColumnDefinitions>