diff --git a/DataStore/DataStructures.cs b/DataStore/DataStructures.cs
index 6c81528..b082d93 100644
--- a/DataStore/DataStructures.cs
+++ b/DataStore/DataStructures.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Logof_Client;
 
@@ -32,11 +33,16 @@ public class KasAddressList //Address-Set
         this.owner_id = owner_id;
     }
 
-    public static string GenerateName(string basic_type, bool? is_rest = false)
+    public static async Task<string> GenerateName(string basic_type, bool? is_rest = false)
     {
+        string pre = "";
+
         if (is_rest == true)
             return basic_type + " - " + DateTime.Now.ToShortDateString() + " - Rest";
-        return basic_type + " - " + DateTime.Now.ToShortDateString();
+        pre = basic_type + " - " + DateTime.Now.ToShortDateString();
+
+        var result = await NamingWindow.Show(MainWindow._instance, pre);
+        return string.IsNullOrWhiteSpace(result) ? pre : result;
     }
 
     // public void UpdateErrorList(List<KasPersonError> errorList)
@@ -206,4 +212,4 @@ public class KasPersonError
 
         return output;
     }
-}
\ No newline at end of file
+}
diff --git a/DataStore/Settings.cs b/DataStore/Settings.cs
index 5443e03..95bdb8b 100644
--- a/DataStore/Settings.cs
+++ b/DataStore/Settings.cs
@@ -10,6 +10,7 @@ public class Settings
     public static Settings _instance = new();
     public AddressSets addressSets = new();
     public Customers customers = new();
+    public PdfExportSettings pdfExport { get; set; } = new();
 
     public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
         "logofclient", "config.json");
@@ -52,6 +53,25 @@ public class Settings
     }
 }
 
+public class PdfExportSettings
+{
+    public double cellPaddingTopMm { get; set; } = 5;
+    public double cellPaddingBottomMm { get; set; } = 5;
+    public double cellPaddingLeftMm { get; set; } = 5;
+    public double cellPaddingRightMm { get; set; } = 5;
+
+    public double pageMarginTopMm { get; set; } = 0;
+    public double pageMarginBottomMm { get; set; } = 0;
+    public double pageMarginLeftMm { get; set; } = 0;
+    public double pageMarginRightMm { get; set; } = 0;
+
+    public int rowsPerPage { get; set; } = 7;
+    public int columnsPerPage { get; set; } = 3;
+
+    public double fontSize { get; set; } = 9;
+    public double smallFontSize { get; set; } = 6;
+}
+
 public class Global
 {
     public static Global _instance;
@@ -191,4 +211,4 @@ public class Country
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/MainWindow.axaml b/MainWindow.axaml
index 006f2b5..74a96f0 100644
--- a/MainWindow.axaml
+++ b/MainWindow.axaml
@@ -28,7 +28,7 @@
                             <Label FontSize="20" Content="Addressverwaltung" VerticalContentAlignment="Center" />
                         </StackPanel>
                     </TabItem.Header>
-                    <Grid RowDefinitions="2*,*,*">
+                    <Grid RowDefinitions="3*,80,2*">
                         <Grid ColumnDefinitions="*,*" Grid.Row="0">
                             <!-- Kunden -->
                             <Grid Margin="30,30,10,30">
@@ -78,7 +78,7 @@
                                                     </StackPanel>
                                                 </MenuItem.Header>
                                             </MenuItem>
-                                            <MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetDelete_OnClick">
+                                            <MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetRename_OnClick" IsEnabled="False">
                                                 <MenuItem.Header>
                                                     <StackPanel Orientation="Horizontal">
                                                         <LucideIcon Kind="Trash" Width="12" Height="12" Size="12" />
@@ -99,23 +99,10 @@
                                 </Button>
                             </Grid>
                         </Grid>
-                        <!-- <Grid Grid.Row="0"> -->
-                        <!--     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" -->
-                        <!--                 HorizontalAlignment="Center"> -->
-                        <!--         <TextBox x:Name="TbFilename" Watermark="Dateipfad" Width="400" -->
-                        <!--                  VerticalContentAlignment="Center" /> -->
-                        <!--         <Button x:Name="BtnChooseFile" Margin="10,0,0,0" Click="BtnChooseFile_OnClick"> -->
-                        <!--             <StackPanel Orientation="Horizontal"> -->
-                        <!--                 <LucideIcon Kind="FolderOpen" Width="16" Height="16" Size="16" /> -->
-                        <!--                 <Label Content="Öffnen" VerticalContentAlignment="Center" /> -->
-                        <!--             </StackPanel> -->
-                        <!--         </Button> -->
-                        <!--     </StackPanel> -->
-                        <!-- </Grid> -->
-                        <Grid Grid.ColumnDefinitions="*,*" Grid.Row="1">
-                            <StackPanel Grid.Column="0" Width="250" Orientation="Vertical" HorizontalAlignment="Right"
+                        <!-- <Grid ColumnDefinitions="*,*,*" Grid.Row="1"> -->
+                            <StackPanel Grid.Row="1"  Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center"
                                         Margin="0,0,5,0">
-                                <Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                                <Button  Width="250" HorizontalContentAlignment="Center"
                                         Margin="0,0,0,10" IsEnabled="False"
                                         x:Name="BtnCheck" Click="BtnCheck_OnClick">
                                     <StackPanel Orientation="Horizontal">
@@ -124,7 +111,7 @@
                                                FontWeight="Bold" />
                                     </StackPanel>
                                 </Button>
-                                <Button HorizontalAlignment="Stretch" IsEnabled="False"
+                                <Button Width="250" IsEnabled="False"
                                         HorizontalContentAlignment="Center"
                                         Click="BtnCombine_OnClick" x:Name="BtnCombine"
                                         Margin="0,0,0,10">
@@ -134,19 +121,7 @@
                                                FontWeight="Bold" />
                                     </StackPanel>
                                 </Button>
-                                <Button HorizontalAlignment="Stretch" IsEnabled="False"
-                                        HorizontalContentAlignment="Center" x:Name="BtnRepair"
-                                        Margin="0,0,0,10">
-                                    <StackPanel Orientation="Horizontal">
-                                        <LucideIcon Kind="Hammer" Width="36" Height="36" />
-                                        <Label Content="Reparieren" VerticalContentAlignment="Center" FontSize="15"
-                                               FontWeight="Bold" />
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
-                            <StackPanel Grid.Column="1" Width="250" Orientation="Vertical" HorizontalAlignment="Left"
-                                        Margin="5,0,0,0">
-                                <Button HorizontalAlignment="Stretch" IsEnabled="False"
+                                <Button Width="250" IsEnabled="False"
                                         HorizontalContentAlignment="Center" x:Name="BtnShorten"
                                         Margin="0,0,0,10">
                                     <StackPanel Orientation="Horizontal">
@@ -155,7 +130,7 @@
                                                FontWeight="Bold" />
                                     </StackPanel>
                                 </Button>
-                                <Button HorizontalAlignment="Stretch" IsEnabled="False"
+                                <Button Width="250" IsEnabled="False"
                                         Click="BtnGenerateLabels_OnClick"
                                         HorizontalContentAlignment="Center" x:Name="BtnGenerateLabels"
                                         Margin="0,0,0,10">
@@ -166,8 +141,17 @@
                                                FontWeight="Bold" />
                                     </StackPanel>
                                 </Button>
+                                <Button Width="250" IsEnabled="False"
+                                        HorizontalContentAlignment="Center" x:Name="BtnRepair"
+                                        Margin="0,0,0,10">
+                                    <StackPanel Orientation="Horizontal">
+                                        <LucideIcon Kind="Hammer" Width="36" Height="36" />
+                                        <Label Content="Reparieren" VerticalContentAlignment="Center" FontSize="15"
+                                               FontWeight="Bold" />
+                                    </StackPanel>
+                                </Button>
                             </StackPanel>
-                        </Grid>
+                        <!-- </Grid> -->
                         <Grid Grid.Row="2" Margin="20" IsVisible="True" x:Name="GrdCalcMan">
                             <Image Source="assets/calc_man.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
                         </Grid>
@@ -242,6 +226,71 @@
                                 <CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
                             </StackPanel>
                         </Grid>
+                        <Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
+                            <StackPanel Grid.Column="1" Orientation="Vertical" Spacing="20">
+                                <Grid ColumnDefinitions="*,*,*" ColumnSpacing="20">
+                                    <StackPanel Orientation="Vertical" Spacing="10">
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Zellenrand oben (mm)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingTop" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Zellenrand unten (mm)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingBot" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Zellenrand links (mm)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingLeft" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
+                                        </Grid>
+                                    </StackPanel>
+                                    
+                                    <StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Content="Zellenabstand oben"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginTop" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Content="Zellenabstand unten"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginBottom" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Content="Zellenabstand rechts"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginRight" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Content="Zellenabstand links"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginLeft" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
+                                        </Grid>
+                                    </StackPanel>
+                                    
+                                    <StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Content="Zeilen pro Seite"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="TbExpMargRowsPerPage" Minimum="1" Maximum="10" Value="7"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Spalten pro Seite"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargColumnsPerPage" Minimum="1" Maximum="8" Value="3"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Schriftgröße (groß)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargFontSize" Minimum="5" Maximum="30" Value="9"></NumericUpDown>
+                                        </Grid>
+                                        <Grid ColumnDefinitions="*,*">
+                                            <Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
+                                            <NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
+                                        </Grid>
+                                    </StackPanel>
+                                </Grid>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                    <Button Content="Start" Click="BtnStartGenerateLabels_OnClick"></Button>
+                                </StackPanel>
+                            </StackPanel>
+                        </Grid>
                     </Grid>
                 </TabItem>
                 <TabItem IsEnabled="False">
@@ -278,8 +327,12 @@
                     <Grid ColumnDefinitions="300,*">
                         <Border Grid.Column="0" Background="#FFF" BorderBrush="#DDD" BorderThickness="0,0,1,0">
                             <StackPanel>
-                                <Button Content="+ Hinzufügen" Margin="10" x:Name="BtnWikiAddFile"
-                                        Click="BtnWikiAddFile_OnClick" />
+                                <StackPanel Spacing="10" Orientation="Horizontal" Margin="10">
+                                    <Button Content="+ Datei" x:Name="BtnWikiAddFile"
+                                            Click="BtnWikiAddFile_OnClick" />
+                                    <Button Content="+ Ordner" x:Name="BtnWikiAddFolder"
+                                            Click="BtnWikiAddFolder_OnClick" />
+                                </StackPanel>
                                 <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
                                     <TreeView Name="NavTree" Margin="10" />
                                 </ScrollViewer>
@@ -563,4 +616,4 @@
         </Grid>
 
     </Border>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs
index 4f1a3cf..2333962 100644
--- a/MainWindow.axaml.cs
+++ b/MainWindow.axaml.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Controls.Primitives;
 using Avalonia.Platform.Storage;
 using Logof_Client.Wiki;
 
@@ -33,6 +34,8 @@ public partial class MainWindow : Window
         WindowState = WindowState.Maximized;
         Global.Load();
         Settings.Load();
+        LoadPdfExportOptions();
+        HookPdfExportOptionEvents();
 
         RefreshCountryView();
 
@@ -183,18 +186,20 @@ public partial class MainWindow : Window
     {
         GrdCalcMan.IsVisible = false;
         GrdCombineTypes.IsVisible = true;
+        GrdExportMarginOptions.IsVisible = false;
     }
 
     private void MakeCalcManVisible()
     {
         GrdCalcMan.IsVisible = true;
         GrdCombineTypes.IsVisible = false;
+        GrdExportMarginOptions.IsVisible = false;
     }
 
     private async void StartCombine(Uri path)
     {
         MakeCalcManVisible();
-        var addresses = DataImport.ImportKasAddressList(path);
+        var addresses = await DataImport.ImportKasAddressList(path);
         var progressWindow = new ProgressWindow();
         var address_list = new List<KasAddressList> { addresses.Item2 };
 
@@ -216,7 +221,7 @@ public partial class MainWindow : Window
         if (file == null) return;
 
         //filePath = file[0].Path;
-        foreach (var f in file) address_list.Add(DataImport.ImportKasAddressList(f.Path).Item2);
+        foreach (var f in file) address_list.Add((await DataImport.ImportKasAddressList(f.Path)).Item2);
 
         progressWindow.Show(_instance);
 
@@ -255,12 +260,20 @@ public partial class MainWindow : Window
         }
     }
 
-    public void PopulateNavTree()
+    public void PopulateNavTree(string? expandToPath = null, string? selectPath = null)
     {
         var roots = _wikiService.GetRootItems();
         var nodes = new List<TreeViewItem>();
         foreach (var r in roots) nodes.Add(BuildNode(r));
         NavTree.ItemsSource = nodes;
+
+        if (!string.IsNullOrWhiteSpace(expandToPath))
+            ExpandAndFindNode(nodes, expandToPath, out _);
+
+        if (!string.IsNullOrWhiteSpace(selectPath) &&
+            ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
+            selectedNode != null)
+            NavTree.SelectedItem = selectedNode;
     }
 
     private TreeViewItem BuildNode(WikiItem item)
@@ -273,6 +286,63 @@ public partial class MainWindow : Window
         return node;
     }
 
+    private string GetSelectedWikiTargetDirectory()
+    {
+        var wikiRoot = Global._instance.wiki_storage_path;
+        if (NavTree.SelectedItem is TreeViewItem treeItem && treeItem.Tag is WikiItem selectedItem)
+        {
+            if (selectedItem.IsFolder) return selectedItem.Path;
+
+            var parentDir = Path.GetDirectoryName(selectedItem.Path);
+            if (!string.IsNullOrWhiteSpace(parentDir)) return parentDir;
+        }
+
+        return wikiRoot;
+    }
+
+    private static bool PathsEqual(string left, string right)
+    {
+        var normalizedLeft = Path.GetFullPath(left)
+            .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+        var normalizedRight = Path.GetFullPath(right)
+            .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+
+        var comparison = OperatingSystem.IsWindows()
+            ? StringComparison.OrdinalIgnoreCase
+            : StringComparison.Ordinal;
+        return string.Equals(normalizedLeft, normalizedRight, comparison);
+    }
+
+    private bool ExpandAndFindNode(IEnumerable<TreeViewItem> nodes, string targetPath, out TreeViewItem? foundNode)
+    {
+        foreach (var node in nodes)
+            if (TryExpandToPath(node, targetPath, out foundNode))
+                return true;
+
+        foundNode = null;
+        return false;
+    }
+
+    private bool TryExpandToPath(TreeViewItem node, string targetPath, out TreeViewItem? foundNode)
+    {
+        if (node.Tag is WikiItem item && PathsEqual(item.Path, targetPath))
+        {
+            foundNode = node;
+            return true;
+        }
+
+        foreach (var childRaw in node.Items)
+            if (childRaw is TreeViewItem childNode &&
+                TryExpandToPath(childNode, targetPath, out foundNode))
+            {
+                node.IsExpanded = true;
+                return true;
+            }
+
+        foundNode = null;
+        return false;
+    }
+
     private void OpenFolderButton_Click(object? sender, RoutedEventArgs e)
     {
         var path = Global._instance.wiki_storage_path;
@@ -542,7 +612,7 @@ public partial class MainWindow : Window
             {
                 if (customer.patch == null)
                 {
-                    var got = DataImport.ImportKasAddressList(selected_path, null, customer.separator);
+                    var got = await DataImport.ImportKasAddressList(selected_path, null, customer.separator);
                     if (!got.Item1)
                     {
                         Console.WriteLine("Error while importing. Please try another file.");
@@ -558,7 +628,7 @@ public partial class MainWindow : Window
                 }
                 else
                 {
-                    var got = DataImport.ImportKasAddressList(selected_path, customer.patch, customer.separator);
+                    var got = await DataImport.ImportKasAddressList(selected_path, customer.patch, customer.separator);
                     if (!got.Item1)
                     {
                         Console.WriteLine("Error while importing. Please try another file.");
@@ -593,7 +663,7 @@ public partial class MainWindow : Window
         foreach (var k in Settings._instance.addressSets.addresses)
         foreach (var customer in Settings._instance.customers.customers)
             if (customer.ID == k.owner_id && customer.ID == customer_id)
-                LstCustomerAdressSets.Items.Add(k.ID + " - " + k.Name + "(" + k.KasPersons.Count + " Einträge)");
+                LstCustomerAdressSets.Items.Add(k.ID + " - " + k.Name + " (" + k.KasPersons.Count + " Einträge)");
     }
 
     private void LstCustomerAdressSets_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
@@ -675,8 +745,14 @@ public partial class MainWindow : Window
         foreach (var item in LstCustomerAdressSets.SelectedItems)
             list.Add(Settings._instance.addressSets.GetAddressSetByID(
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
-
-        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference");
+        try
+        {
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference");
+        }
+        catch
+        {
+            
+        }
     }
 
     private void BtnCombineUnion_OnClick(object? sender, RoutedEventArgs e)
@@ -685,8 +761,15 @@ public partial class MainWindow : Window
         foreach (var item in LstCustomerAdressSets.SelectedItems)
             list.Add(Settings._instance.addressSets.GetAddressSetByID(
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
-
-        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union");
+        try
+        {
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union");
+        }
+        catch
+        {
+            
+        }
+        
     }
 
     private void BtnCombineIntersection_OnClick(object? sender, RoutedEventArgs e)
@@ -695,8 +778,14 @@ public partial class MainWindow : Window
         foreach (var item in LstCustomerAdressSets.SelectedItems)
             list.Add(Settings._instance.addressSets.GetAddressSetByID(
                 Convert.ToInt32(item.ToString().Split(" - ")[0])));
-
-        StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection");
+        try
+        {
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection");
+        }
+        catch
+        {
+                
+        }
     }
 
     private void BtnCombineSymmetricDifference_OnClick(object? sender, RoutedEventArgs e)
@@ -711,6 +800,16 @@ public partial class MainWindow : Window
 
     private async void BtnGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
     {
+        GrdCalcMan.IsVisible = false;
+        GrdCombineTypes.IsVisible = false;
+        GrdExportMarginOptions.IsVisible = true;
+        LoadPdfExportOptions();
+    }
+
+    private async void BtnStartGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
+    {
+        SavePdfExportOptions();
+
         var saveDialog = new SaveFileDialog
         {
             DefaultExtension = "pdf",
@@ -720,7 +819,7 @@ public partial class MainWindow : Window
 
         if (!string.IsNullOrEmpty(filePath))
         {
-            var builder = new PdfBuilder();
+            var builder = new PdfBuilder(Settings._instance.pdfExport);
 
             builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder(
                 Convert.ToInt32(LstCustomerAdressSets.SelectedItems[0].ToString().Split(" - ")[0]),
@@ -731,6 +830,87 @@ public partial class MainWindow : Window
         }
     }
 
+    private void HookPdfExportOptionEvents()
+    {
+        var controls = GetPdfExportControls();
+        foreach (var control in controls) control.ValueChanged += PdfExportOption_OnValueChanged;
+    }
+
+    private void LoadPdfExportOptions()
+    {
+        var options = Settings._instance.pdfExport ?? new PdfExportSettings();
+
+        NudExpMargCellPaddingTop.Value = (decimal)options.cellPaddingTopMm;
+        NudExpMargCellPaddingBot.Value = (decimal)options.cellPaddingBottomMm;
+        NudExpMargCellPaddingLeft.Value = (decimal)options.cellPaddingLeftMm;
+        NudExpMargCellPaddingRight.Value = (decimal)options.cellPaddingRightMm;
+
+        TbExpMargMarginTop.Value = (decimal)options.pageMarginTopMm;
+        TbExpMargMarginBottom.Value = (decimal)options.pageMarginBottomMm;
+        TbExpMargMarginLeft.Value = (decimal)options.pageMarginLeftMm;
+        TbExpMargMarginRight.Value = (decimal)options.pageMarginRightMm;
+
+        TbExpMargRowsPerPage.Value = options.rowsPerPage;
+        NudExpMargColumnsPerPage.Value = options.columnsPerPage;
+        NudExpMargFontSize.Value = (decimal)options.fontSize;
+        NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize;
+    }
+
+    private void SavePdfExportOptions()
+    {
+        Settings._instance.pdfExport = new PdfExportSettings
+        {
+            cellPaddingTopMm = ReadDouble(NudExpMargCellPaddingTop),
+            cellPaddingBottomMm = ReadDouble(NudExpMargCellPaddingBot),
+            cellPaddingLeftMm = ReadDouble(NudExpMargCellPaddingLeft),
+            cellPaddingRightMm = ReadDouble(NudExpMargCellPaddingRight),
+            pageMarginTopMm = ReadDouble(TbExpMargMarginTop),
+            pageMarginBottomMm = ReadDouble(TbExpMargMarginBottom),
+            pageMarginLeftMm = ReadDouble(TbExpMargMarginLeft),
+            pageMarginRightMm = ReadDouble(TbExpMargMarginRight),
+            rowsPerPage = ReadInt(TbExpMargRowsPerPage, 7),
+            columnsPerPage = ReadInt(NudExpMargColumnsPerPage, 3),
+            fontSize = ReadDouble(NudExpMargFontSize),
+            smallFontSize = ReadDouble(NudExpMargSmallFontSize)
+        };
+
+        Settings.Save();
+    }
+
+    private void PdfExportOption_OnValueChanged(object? sender, NumericUpDownValueChangedEventArgs e)
+    {
+        SavePdfExportOptions();
+    }
+
+    private double ReadDouble(NumericUpDown control)
+    {
+        return (double)(control.Value ?? 0);
+    }
+
+    private int ReadInt(NumericUpDown control, int fallback)
+    {
+        return (int)Math.Round(control.Value ?? fallback);
+    }
+
+    private NumericUpDown[] GetPdfExportControls()
+    {
+        return
+        [
+            NudExpMargCellPaddingTop,
+            NudExpMargCellPaddingBot,
+            NudExpMargCellPaddingLeft,
+            NudExpMargCellPaddingRight,
+            TbExpMargMarginTop,
+            TbExpMargMarginBottom,
+            TbExpMargMarginLeft,
+            TbExpMargMarginRight,
+            TbExpMargRowsPerPage,
+            NudExpMargColumnsPerPage,
+            NudExpMargFontSize,
+            NudExpMargSmallFontSize
+        ];
+    }
+
     private void TbSettingsCustomerSenderAddress_OnTextChanged(object? sender, TextChangedEventArgs e)
     {
         if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
@@ -876,17 +1056,51 @@ public partial class MainWindow : Window
     private async void BtnWikiAddFile_OnClick(object? sender, RoutedEventArgs e)
     {
         var result = await NamingWindow.Show(this);
-        if (result != null)
-            try
-            {
-                File.WriteAllText(Path.Combine(Global._instance.wiki_storage_path, result), "");
-                PopulateNavTree();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(this, ex.StackTrace, "Fehler");
-            }
+        if (string.IsNullOrWhiteSpace(result)) return;
+
+        result = result.Trim();
+        if (!result.EndsWith(".md", StringComparison.OrdinalIgnoreCase)) result += ".md";
+
+        if (!Directory.Exists(Global._instance.wiki_storage_path))
+            Directory.CreateDirectory(Global._instance.wiki_storage_path);
+
+        try
+        {
+            var targetDirectory = GetSelectedWikiTargetDirectory();
+            Directory.CreateDirectory(targetDirectory);
+            var newFilePath = Path.Combine(targetDirectory, result);
+            File.WriteAllText(newFilePath, "");
+            PopulateNavTree(targetDirectory, newFilePath);
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(this, ex.StackTrace, "Fehler");
+        }
     }
+    
+    private async void BtnWikiAddFolder_OnClick(object? sender, RoutedEventArgs e)
+    {
+        var result = await NamingWindow.Show(this);
+        if (string.IsNullOrWhiteSpace(result)) return;
+
+        result = result.Trim();
+        
+        if (!Directory.Exists(Global._instance.wiki_storage_path))
+            Directory.CreateDirectory(Global._instance.wiki_storage_path);
+
+        try
+        {
+            var targetDirectory = GetSelectedWikiTargetDirectory();
+            var newFolderPath = Path.Combine(targetDirectory, result);
+            Directory.CreateDirectory(newFolderPath);
+            PopulateNavTree(targetDirectory, newFolderPath);
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(this, ex.StackTrace, "Fehler");
+        }
+    }
+
 
     private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
     {
@@ -914,31 +1128,4 @@ public partial class MainWindow : Window
                 MessageBox.Show(this, ex.StackTrace, "Fehler");
             }
     }
-
-    private async void MnIAdSetDelete_OnClick(object? sender, RoutedEventArgs e)
-    {
-        if (LstCustomerAdressSets.SelectedItems.Count > 0)
-            try
-            {
-                var result = await MessageBox.Show(this, "Wirklich löschen?", "Wirklich?", MessageBoxButton.YesNo);
-                if (result != null)
-                {
-                    // var id = KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItems[0]
-                    //     .ToString());
-                    // var cus_id = Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString());
-                    // foreach (var set in Settings._instance.addressSets.addresses)
-                    //     if (set.ID == id)
-                    //     {
-                    //         set.Name = result;
-                    //         Settings.Save();
-                    //         RefreshAddressSetListItems(cus_id);
-                    //         break;
-                    //     }
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(this, ex.StackTrace, "Fehler");
-            }
-    }
-}
\ No newline at end of file
+}
diff --git a/NamingWindow.axaml.cs b/NamingWindow.axaml.cs
index 12c7bc0..3cf6f34 100644
--- a/NamingWindow.axaml.cs
+++ b/NamingWindow.axaml.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace Logof_Client;
 
@@ -9,9 +8,7 @@ public partial class NamingWindow : Window
 {
     public NamingWindow()
     {
-        AvaloniaXamlLoader.Load(this);
-
-        //InitializeComponent();
+        InitializeComponent();
     }
 
     public static Task<string> Show(Window parent, string input = "", string info = "Bitte geben Sie einen Namen ein:")
@@ -54,7 +51,7 @@ public partial class NamingWindow : Window
         catch (Exception ex)
         {
             Console.WriteLine("Error while showing naming window: " + ex.Message);
-            return null;
+            return Task.FromResult<string>(null!);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Tasks/CombineAddresses.cs b/Tasks/CombineAddresses.cs
index 140a6f7..324af2e 100644
--- a/Tasks/CombineAddresses.cs
+++ b/Tasks/CombineAddresses.cs
@@ -19,36 +19,11 @@ public class CombineAddresses
     public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type,
         bool? exportUnused)
     {
-        var res = await Task.Run(async () =>
-        {
-            if (type == "difference") return Difference(address_lists, exportUnused);
-            if (type == "union") return Union(address_lists, exportUnused);
-            if (type == "intersection") return Intersection(address_lists, exportUnused);
-            if (type == "symdiff") return SymmetricDifference(address_lists, exportUnused);
+        if (type == "difference") return await Difference(address_lists, exportUnused);
+        if (type == "union") return await Union(address_lists, exportUnused);
+        if (type == "intersection") return await Intersection(address_lists, exportUnused);
+        if (type == "symdiff") return await SymmetricDifference(address_lists, exportUnused);
 
-            return null;
-        });
-
-
-        return res.Result;
-
-
-        // KasAddressList result = new("Ergebnis_" + DateTime.Now.ToString("ddMMyy_HHmmss"));
-        // await Task.Run(async () =>
-        // {
-        //     for (var i = 0; i < address_lists.Count; i++)
-        //         if (i == 0)
-        //             lock (result)
-        //             {
-        //                 result = address_lists[i];
-        //             }
-        //         else
-        //             lock (result)
-        //             {
-        //                 result = Merge(result, address_lists[i], i + 1, address_lists.Count).Result;
-        //             }
-        // });
-        // return result;
         return (null, null);
     }
 
@@ -62,7 +37,8 @@ public class CombineAddresses
     /// <returns></returns>
     public bool CompareAddresses(KasPerson first, KasPerson second, bool only_refsid = false)
     {
-        if (first.refsid == second.refsid) return true;
+        // A refsid of 0 means "missing", so it must not collapse unrelated entries.
+        if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
         if (!only_refsid)
             if (first.name == second.name &&
                 first.anrede == second.anrede &&
@@ -97,7 +73,7 @@ public class CombineAddresses
         Progress? progress = null)
     {
         if (address_lists == null || address_lists.Count == 0)
-            return (new KasAddressList(KasAddressList.GenerateName("difference")), null);
+            return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
 
         progress ??= new Progress
         {
@@ -109,8 +85,8 @@ public class CombineAddresses
         var restUnion = new List<KasPerson>();
         for (var i = 1; i < address_lists.Count; i++)
             restUnion.AddRange(address_lists[i].KasPersons);
-        var result = new KasAddressList(KasAddressList.GenerateName("difference"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("difference_rest"));
+        var result = new KasAddressList(await KasAddressList.GenerateName("difference"));
+        var second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
 
         foreach (var person in address_lists[0].KasPersons)
         {
@@ -136,8 +112,8 @@ public class CombineAddresses
     public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, bool? return_unused,
         Progress progress = null)
     {
-        var result = new KasAddressList(KasAddressList.GenerateName("union"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("union_rest"));
+        var result = new KasAddressList(await KasAddressList.GenerateName("union"));
+        var second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
             return (result, null);
@@ -178,8 +154,8 @@ public class CombineAddresses
     public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists,
         bool? return_unused, Progress progress = null)
     {
-        var result = new KasAddressList(KasAddressList.GenerateName("intersection"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("intersection_rest"));
+        var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
+        var second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
             return (result, null);
@@ -225,8 +201,8 @@ public class CombineAddresses
     public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists,
         bool? return_unused, Progress progress = null)
     {
-        var result = new KasAddressList(KasAddressList.GenerateName("symmetric_difference"));
-        var second_result = new KasAddressList(KasAddressList.GenerateName("symmetric_rest"));
+        var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
+        var second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
 
         if (address_lists == null || address_lists.Count == 0)
             return (result, null);
@@ -354,4 +330,4 @@ public class Progress
         var comparedPersons = ComparedPersons;
         Interlocked.Increment(ref comparedPersons);
     }
-}
\ No newline at end of file
+}
diff --git a/Tasks/CsvBuilder.cs b/Tasks/CsvBuilder.cs
index 6365ada..255f190 100644
--- a/Tasks/CsvBuilder.cs
+++ b/Tasks/CsvBuilder.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace Logof_Client;
@@ -30,34 +31,45 @@ public class CsvBuilder
 
         result.AppendLine(Header);
         foreach (var l in KasAddressList.KasPersons)
-
-            result.AppendLine(
-                l.refsid + Separator +
-                l.anrede + Separator +
-                l.titel + Separator +
-                l.vorname + Separator +
-                l.adel + Separator +
-                l.name + Separator +
-                l.namezus + Separator +
-                l.anredzus + Separator +
-                l.strasse + Separator +
-                l.strasse2 + Separator +
-                l.plz + Separator +
-                l.ort + Separator +
-                l.land + Separator +
-                l.pplz + Separator +
-                l.postfach + Separator +
-                l.name1 + Separator +
-                l.name2 + Separator +
-                l.name3 + Separator +
-                l.name4 + Separator +
-                l.name5 + Separator +
-                l.funktion + Separator +
-                l.funktion2 + Separator +
-                l.abteilung + Separator +
-                l.funktionad);
+            result.AppendLine(string.Join(Separator, new[]
+            {
+                EscapeCsvField(l.refsid.ToString()),
+                EscapeCsvField(l.anrede),
+                EscapeCsvField(l.titel),
+                EscapeCsvField(l.vorname),
+                EscapeCsvField(l.adel),
+                EscapeCsvField(l.name),
+                EscapeCsvField(l.namezus),
+                EscapeCsvField(l.anredzus),
+                EscapeCsvField(l.strasse),
+                EscapeCsvField(l.strasse2),
+                EscapeCsvField(l.plz),
+                EscapeCsvField(l.ort),
+                EscapeCsvField(l.land),
+                EscapeCsvField(l.pplz),
+                EscapeCsvField(l.postfach),
+                EscapeCsvField(l.name1),
+                EscapeCsvField(l.name2),
+                EscapeCsvField(l.name3),
+                EscapeCsvField(l.name4),
+                EscapeCsvField(l.name5),
+                EscapeCsvField(l.funktion),
+                EscapeCsvField(l.funktion2),
+                EscapeCsvField(l.abteilung),
+                EscapeCsvField(l.funktionad)
+            }));
 
         // weitere Cases
         return result.ToString();
     }
-}
\ No newline at end of file
+
+    private string EscapeCsvField(string? value)
+    {
+        var field = value ?? string.Empty;
+        var mustQuote = field.Contains(Separator) || field.Contains('"') || field.Contains('\r') || field.Contains('\n');
+        if (!mustQuote)
+            return field;
+
+        return "\"" + field.Replace("\"", "\"\"") + "\"";
+    }
+}
diff --git a/Tasks/DataImport.cs b/Tasks/DataImport.cs
index e8f6464..d2961f6 100644
--- a/Tasks/DataImport.cs
+++ b/Tasks/DataImport.cs
@@ -3,20 +3,22 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace Logof_Client;
 
 public class DataImport
 {
-    public static (bool, KasAddressList) ImportKasAddressList(Uri pathToCsv, AddressPatch patch = null,
+    public static async Task<(bool, KasAddressList)> ImportKasAddressList(Uri pathToCsv, AddressPatch patch = null,
         char separator = ',')
     {
         if (patch == null)
-            return ImportKasAddressListWithoutPatch(pathToCsv, separator);
-        return ImportKasAddressListWithPatch(pathToCsv, patch, separator);
+            return await ImportKasAddressListWithoutPatch(pathToCsv, separator);
+        return await ImportKasAddressListWithPatch(pathToCsv, patch, separator);
     }
 
-    private static (bool, KasAddressList) ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
+    private static async Task<(bool, KasAddressList)> ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
     {
         if (!File.Exists(pathToCsv.LocalPath))
         {
@@ -32,8 +34,8 @@ public class DataImport
             return (false, null);
         }
 
-        var imported =
-            new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
+        var imported = new KasAddressList(
+            await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
 
         while (!reader.EndOfStream)
         {
@@ -41,7 +43,7 @@ public class DataImport
             if (string.IsNullOrWhiteSpace(line))
                 continue;
 
-            var parts = line.Split(separator).Select(p => p.Trim()).ToArray();
+            var parts = ParseCsvLine(line, separator);
 
             if (parts.Length < 24)
             {
@@ -90,7 +92,7 @@ public class DataImport
         return (true, imported);
     }
 
-    private static (bool, KasAddressList) ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
+    private static async Task<(bool, KasAddressList)> ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
         char separator)
     {
         if (!File.Exists(pathToCsv.LocalPath))
@@ -107,10 +109,10 @@ public class DataImport
             return (false, null);
         }
 
-        var headers = headerLine.Split(separator).Select(h => h.Trim()).ToArray();
+        var headers = ParseCsvLine(headerLine, separator);
 
-        var imported =
-            new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
+        var imported = new KasAddressList(
+            await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
         var patchType = typeof(AddressPatch);
         var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
 
@@ -126,7 +128,7 @@ public class DataImport
             if (string.IsNullOrWhiteSpace(line))
                 continue;
 
-            var parts = line.Split(separator).Select(p => p.Trim()).ToArray();
+            var parts = ParseCsvLine(line, separator);
 
             var fieldValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
@@ -241,4 +243,41 @@ public class DataImport
     {
         return int.TryParse(input, out var result) ? result : 0;
     }
-}
\ No newline at end of file
+
+    private static string[] ParseCsvLine(string line, char separator)
+    {
+        var fields = new List<string>();
+        var current = new StringBuilder();
+        var inQuotes = false;
+
+        for (var i = 0; i < line.Length; i++)
+        {
+            var c = line[i];
+
+            if (c == '"')
+            {
+                if (inQuotes && i + 1 < line.Length && line[i + 1] == '"')
+                {
+                    current.Append('"');
+                    i++;
+                    continue;
+                }
+
+                inQuotes = !inQuotes;
+                continue;
+            }
+
+            if (c == separator && !inQuotes)
+            {
+                fields.Add(current.ToString().Trim());
+                current.Clear();
+                continue;
+            }
+
+            current.Append(c);
+        }
+
+        fields.Add(current.ToString().Trim());
+        return fields.ToArray();
+    }
+}
diff --git a/Tasks/PdfBuilder.cs b/Tasks/PdfBuilder.cs
index c585062..d33a587 100644
--- a/Tasks/PdfBuilder.cs
+++ b/Tasks/PdfBuilder.cs
@@ -11,35 +11,15 @@ namespace Logof_Client;
 
 public class PdfBuilder
 {
-    // Table layout
-    private const int CellsPerRow = 3;
-    private const int CellsPerPage = 21; // 3 columns × 7 rows
+    private readonly PdfExportSettings _settings;
     private readonly XFont _boldFont;
-    private readonly double _cellHeight = 42.43; // mm
-    private readonly double _cellPaddingBottom = 5; // mm
-
-    // Padding inside cells
-    private readonly double _cellPaddingLeft = 5; // mm
-    private readonly double _cellPaddingTop = 5; // mm
-
-    // Cell dimensions (in mm)
-    private readonly double _cellWidth = 70; // mm
-
-    // Font settings
-    private readonly double _fontSize = 9;
-
-    private readonly double _marginBottom = 1; // mm
-
-    // Paper and layout settings
-    private readonly double _marginLeft = 0; // mm
-    private readonly double _marginRight = 0; // mm
-    private readonly double _marginTop = 0; // mm
     private readonly XFont _regularFont;
     private readonly XFont _smallFont;
 
-    public PdfBuilder()
+    public PdfBuilder(PdfExportSettings? settings = null)
     {
         EnsureFontResolverRegistered();
+        _settings = settings ?? new PdfExportSettings();
 
         // Select first font from build output fonts folder (AppContext.BaseDirectory/fonts)
         var chosenFamily = "Arial";
@@ -57,9 +37,9 @@ public class PdfBuilder
             chosenFamily = "Arial";
         }
 
-        _boldFont = new XFont(chosenFamily, 9, XFontStyleEx.Bold);
-        _regularFont = new XFont(chosenFamily, 9, XFontStyleEx.Regular);
-        _smallFont = new XFont(chosenFamily, 6, XFontStyleEx.Regular);
+        _boldFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Bold);
+        _regularFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Regular);
+        _smallFont = new XFont(chosenFamily, _settings.smallFontSize, XFontStyleEx.Regular);
     }
 
     private static void EnsureFontResolverRegistered()
@@ -159,20 +139,17 @@ public class PdfBuilder
 
     private void DrawPage(XGraphics gfx, List<string> addresses, ref int addressIndex)
     {
-        var cellCount = 0;
-
-        for (var row = 0; row < 7; row++)
+        for (var row = 0; row < _settings.rowsPerPage; row++)
         {
-            for (var col = 0; col < 3; col++)
+            for (var col = 0; col < _settings.columnsPerPage; col++)
             {
                 if (addressIndex >= addresses.Count) break;
 
-                var x = MmToPoints(_marginLeft + col * _cellWidth);
-                var y = MmToPoints(_marginTop + row * _cellHeight);
+                var x = MmToPoints(_settings.pageMarginLeftMm + col * GetCellWidthMm());
+                var y = MmToPoints(_settings.pageMarginTopMm + row * GetCellHeightMm());
 
                 DrawCell(gfx, x, y, addresses[addressIndex]);
                 addressIndex++;
-                cellCount++;
             }
 
             if (addressIndex >= addresses.Count) break;
@@ -182,13 +159,11 @@ public class PdfBuilder
     private void DrawPageWithPlaceholder(XGraphics gfx, List<string> addresses, ref int addressIndex,
         ref bool isFirstCell, string placeholderText)
     {
-        var cellCount = 0;
-
-        for (var row = 0; row < 7; row++)
-        for (var col = 0; col < 3; col++)
+        for (var row = 0; row < _settings.rowsPerPage; row++)
+        for (var col = 0; col < _settings.columnsPerPage; col++)
         {
-            var x = MmToPoints(_marginLeft + col * _cellWidth);
-            var y = MmToPoints(_marginTop + row * _cellHeight);
+            var x = MmToPoints(_settings.pageMarginLeftMm + col * GetCellWidthMm());
+            var y = MmToPoints(_settings.pageMarginTopMm + row * GetCellHeightMm());
 
             // First cell: placeholder
             if (isFirstCell)
@@ -205,15 +180,13 @@ public class PdfBuilder
             {
                 DrawEmptyCell(gfx, x, y);
             }
-
-            cellCount++;
         }
     }
 
     private void DrawCell(XGraphics gfx, double x, double y, string? address)
     {
-        var cellWidthPoints = MmToPoints(_cellWidth);
-        var cellHeightPoints = MmToPoints(_cellHeight);
+        var cellWidthPoints = MmToPoints(GetCellWidthMm());
+        var cellHeightPoints = MmToPoints(GetCellHeightMm());
 
         // Draw cell border
         var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
@@ -225,8 +198,8 @@ public class PdfBuilder
 
     private void DrawEmptyCell(XGraphics gfx, double x, double y)
     {
-        var cellWidthPoints = MmToPoints(_cellWidth);
-        var cellHeightPoints = MmToPoints(_cellHeight);
+        var cellWidthPoints = MmToPoints(GetCellWidthMm());
+        var cellHeightPoints = MmToPoints(GetCellHeightMm());
 
         var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
         gfx.DrawRectangle(XPens.Black, rect);
@@ -234,11 +207,12 @@ public class PdfBuilder
 
     private void DrawMarkdownText(XGraphics gfx, string text, double x, double y, double cellWidth, double cellHeight)
     {
-        var paddingLeftPoints = MmToPoints(_cellPaddingLeft);
-        var paddingTopPoints = MmToPoints(_cellPaddingTop);
-        var paddingBottomPoints = MmToPoints(_cellPaddingBottom);
+        var paddingLeftPoints = MmToPoints(_settings.cellPaddingLeftMm);
+        var paddingRightPoints = MmToPoints(_settings.cellPaddingRightMm);
+        var paddingTopPoints = MmToPoints(_settings.cellPaddingTopMm);
+        var paddingBottomPoints = MmToPoints(_settings.cellPaddingBottomMm);
 
-        var maxWidth = cellWidth - paddingLeftPoints * 2;
+        var maxWidth = Math.Max(0, cellWidth - paddingLeftPoints - paddingRightPoints);
 
         // Split text by newlines and remove empty trailing lines
         var rawLines = text.Split(new[] { "\n" }, StringSplitOptions.None);
@@ -382,6 +356,18 @@ public class PdfBuilder
         return mm * 2.834645669;
     }
 
+    private double GetCellWidthMm()
+    {
+        var availableWidthMm = 210d - _settings.pageMarginLeftMm - _settings.pageMarginRightMm;
+        return availableWidthMm / _settings.columnsPerPage;
+    }
+
+    private double GetCellHeightMm()
+    {
+        var availableHeightMm = 297d - _settings.pageMarginTopMm - _settings.pageMarginBottomMm;
+        return availableHeightMm / _settings.rowsPerPage;
+    }
+
     // Configuration methods to allow customization
 
     /// <summary>
@@ -401,4 +387,4 @@ public class PdfBuilder
         if (left < 0 || top < 0 || right < 0 || bottom < 0)
             throw new ArgumentException("Margins cannot be negative");
     }
-}
\ No newline at end of file
+}
diff --git a/Wiki/EditorWindow.axaml b/Wiki/EditorWindow.axaml
index 3e15dcc..26c2620 100644
--- a/Wiki/EditorWindow.axaml
+++ b/Wiki/EditorWindow.axaml
@@ -2,16 +2,16 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="Logof_Client.Wiki.EditorWindow"
         Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
-    <Grid>
+    <Grid Margin="10,0,10,10">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Orientation="Horizontal">
+        <StackPanel Grid.Row="0" Spacing="10" Orientation="Horizontal">
             <Button x:Name="BtnSave" Content="Speichern" Click="BtnSave_OnClick" />
             <Button x:Name="BtnSaveAs" Content="Speichern unter..." Click="BtnSaveAs_OnClick" />
             <Button x:Name="BtnDelete" Content="Löschen" Click="BtnDelete_OnClick" />
         </StackPanel>
-        <TextBox Grid.Row="1" x:Name="TbContent" />
+        <TextBox AcceptsTab="True" AcceptsReturn="True" Grid.Row="1" x:Name="TbContent" />
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/Wiki/EditorWindow.axaml.cs b/Wiki/EditorWindow.axaml.cs
index 916e46e..5353f97 100644
--- a/Wiki/EditorWindow.axaml.cs
+++ b/Wiki/EditorWindow.axaml.cs
@@ -52,7 +52,11 @@ public partial class EditorWindow : Window
     {
         var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
         if (result == MessageBoxResult.No) return;
-        File.Delete(filename);
+        try
+        {
+            File.Delete(filename);
+        } catch {}
+        
         MainWindow._instance.PopulateNavTree();
         Close();
     }