diff --git a/Belegscanner.lps b/Belegscanner.lps
index f5145ee..71c478d 100644
--- a/Belegscanner.lps
+++ b/Belegscanner.lps
@@ -9,7 +9,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="17" Y="10"/>
-        <UsageCount Value="31"/>
+        <UsageCount Value="32"/>
       </Unit0>
       <Unit1>
         <Filename Value="scanner.pas"/>
@@ -18,9 +18,9 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="301"/>
-        <CursorPos Y="340"/>
-        <UsageCount Value="31"/>
+        <TopLine Value="304"/>
+        <CursorPos X="30" Y="358"/>
+        <UsageCount Value="32"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -126,123 +126,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="scanner.pas"/>
-        <Caret Line="327" Column="53" TopLine="295"/>
+        <Caret Line="133" Column="107" TopLine="46"/>
       </Position1>
       <Position2>
         <Filename Value="scanner.pas"/>
-        <Caret Line="334" Column="6" TopLine="240"/>
+        <Caret Line="238" Column="49" TopLine="228"/>
       </Position2>
       <Position3>
         <Filename Value="scanner.pas"/>
-        <Caret Line="235" Column="3" TopLine="228"/>
+        <Caret Line="153" Column="3" TopLine="151"/>
       </Position3>
       <Position4>
         <Filename Value="scanner.pas"/>
-        <Caret Line="109" Column="11" TopLine="70"/>
+        <Caret Line="168" Column="15" TopLine="133"/>
       </Position4>
       <Position5>
         <Filename Value="scanner.pas"/>
-        <Caret Line="110" Column="134" TopLine="70"/>
+        <Caret Line="167" Column="7" TopLine="133"/>
       </Position5>
       <Position6>
         <Filename Value="scanner.pas"/>
-        <Caret Line="333" Column="10" TopLine="295"/>
+        <Caret Line="168" Column="11" TopLine="134"/>
       </Position6>
       <Position7>
         <Filename Value="scanner.pas"/>
-        <Caret Line="334" Column="3" TopLine="295"/>
+        <Caret Line="196" Column="66" TopLine="189"/>
       </Position7>
       <Position8>
         <Filename Value="scanner.pas"/>
-        <Caret Line="342" Column="13" TopLine="295"/>
+        <Caret Line="363" Column="97" TopLine="302"/>
       </Position8>
       <Position9>
         <Filename Value="scanner.pas"/>
-        <Caret Line="23" Column="119"/>
+        <Caret Line="131" Column="24" TopLine="97"/>
       </Position9>
       <Position10>
         <Filename Value="scanner.pas"/>
-        <Caret Line="30" Column="15"/>
+        <Caret Line="363" Column="97" TopLine="302"/>
       </Position10>
       <Position11>
         <Filename Value="scanner.pas"/>
-        <Caret Line="48" Column="25"/>
+        <Caret Line="131" Column="24"/>
       </Position11>
       <Position12>
         <Filename Value="scanner.pas"/>
-        <Caret Line="83" Column="126" TopLine="22"/>
+        <Caret Line="238" Column="3" TopLine="231"/>
       </Position12>
       <Position13>
         <Filename Value="scanner.pas"/>
-        <Caret Line="86" Column="21" TopLine="25"/>
+        <Caret Line="153" Column="3" TopLine="151"/>
       </Position13>
       <Position14>
         <Filename Value="scanner.pas"/>
-        <Caret Line="246" Column="120" TopLine="185"/>
+        <Caret Line="168" Column="31" TopLine="161"/>
       </Position14>
       <Position15>
         <Filename Value="scanner.pas"/>
-        <Caret Line="334" Column="33" TopLine="273"/>
+        <Caret Line="150" Column="49" TopLine="134"/>
       </Position15>
       <Position16>
         <Filename Value="scanner.pas"/>
-        <Caret Line="335" Column="44" TopLine="274"/>
+        <Caret Line="168" Column="26" TopLine="134"/>
       </Position16>
       <Position17>
         <Filename Value="scanner.pas"/>
-        <Caret Line="338" Column="31" TopLine="277"/>
+        <Caret Line="242" Column="18" TopLine="230"/>
       </Position17>
       <Position18>
         <Filename Value="scanner.pas"/>
-        <Caret Line="340" Column="24" TopLine="279"/>
+        <Caret Line="188" Column="3" TopLine="184"/>
       </Position18>
       <Position19>
         <Filename Value="scanner.pas"/>
-        <Caret Line="342" Column="13" TopLine="281"/>
+        <Caret Line="310" Column="48" TopLine="301"/>
       </Position19>
       <Position20>
         <Filename Value="scanner.pas"/>
-        <Caret Line="340" Column="3" TopLine="297"/>
+        <Caret Line="224" Column="29" TopLine="190"/>
       </Position20>
       <Position21>
         <Filename Value="scanner.pas"/>
-        <Caret Line="30" Column="15" TopLine="12"/>
+        <Caret Line="188" Column="3" TopLine="184"/>
       </Position21>
       <Position22>
         <Filename Value="scanner.pas"/>
-        <Caret Line="23" Column="119" TopLine="12"/>
+        <Caret Line="365" Column="45" TopLine="301"/>
       </Position22>
       <Position23>
         <Filename Value="scanner.pas"/>
-        <Caret Line="30" Column="15" TopLine="12"/>
+        <Caret Line="357" Column="33" TopLine="301"/>
       </Position23>
       <Position24>
         <Filename Value="scanner.pas"/>
-        <Caret Line="48" Column="25" TopLine="12"/>
+        <Caret TopLine="109"/>
       </Position24>
       <Position25>
         <Filename Value="scanner.pas"/>
-        <Caret Line="83" Column="126" TopLine="22"/>
+        <Caret Line="237" Column="3" TopLine="230"/>
       </Position25>
       <Position26>
         <Filename Value="scanner.pas"/>
-        <Caret Line="86" Column="21" TopLine="25"/>
+        <Caret Line="153" Column="3" TopLine="151"/>
       </Position26>
       <Position27>
         <Filename Value="scanner.pas"/>
-        <Caret Line="83" Column="141" TopLine="125"/>
+        <Caret Line="168" Column="8" TopLine="161"/>
       </Position27>
       <Position28>
         <Filename Value="scanner.pas"/>
-        <Caret Line="23" Column="149" TopLine="25"/>
+        <Caret Line="318" Column="172" TopLine="302"/>
       </Position28>
       <Position29>
         <Filename Value="scanner.pas"/>
-        <Caret Line="224" Column="51" TopLine="213"/>
+        <Caret Line="168" TopLine="134"/>
       </Position29>
       <Position30>
         <Filename Value="scanner.pas"/>
-        <Caret Line="338" Column="39" TopLine="302"/>
+        <Caret Line="358" Column="28" TopLine="302"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/scanner.lfm b/scanner.lfm
index 3f73532..7bdcfcc 100644
--- a/scanner.lfm
+++ b/scanner.lfm
@@ -1,10 +1,10 @@
 object ScanForm: TScanForm
   Left = 2222
-  Height = 869
+  Height = 880
   Top = 198
   Width = 1188
   Caption = 'Belegscanner'
-  ClientHeight = 869
+  ClientHeight = 880
   ClientWidth = 1188
   OnCreate = FormCreate
   LCLVersion = '1.8.2.0'
@@ -13,6 +13,7 @@ object ScanForm: TScanForm
     Height = 28
     Top = 208
     Width = 276
+    Anchors = [akTop, akRight]
     Enabled = False
     ItemHeight = 0
     OnChange = TypeSelectorChange
@@ -24,6 +25,7 @@ object ScanForm: TScanForm
     Height = 28
     Top = 240
     Width = 272
+    Anchors = [akTop, akRight]
     Enabled = False
     ItemHeight = 0
     OnChange = OriginChange
@@ -35,6 +37,7 @@ object ScanForm: TScanForm
     Height = 28
     Top = 304
     Width = 272
+    Anchors = [akTop, akRight]
     Enabled = False
     ItemHeight = 0
     OnChange = DestinationChange
@@ -46,6 +49,7 @@ object ScanForm: TScanForm
     Height = 19
     Top = 840
     Width = 103
+    Anchors = [akLeft, akBottom]
     Caption = 'Ordnername'
     Font.Height = -16
     Font.Name = 'Sans'
@@ -57,6 +61,7 @@ object ScanForm: TScanForm
     Height = 28
     Top = 240
     Width = 276
+    Anchors = [akTop, akRight]
     Enabled = False
     ItemHeight = 0
     OnChange = ProductChange
@@ -69,6 +74,7 @@ object ScanForm: TScanForm
     Height = 49
     Top = 400
     Width = 272
+    Anchors = [akTop, akRight]
     Caption = 'scannen!'
     Enabled = False
     OnClick = ScanButtonClick
@@ -79,6 +85,7 @@ object ScanForm: TScanForm
     Height = 28
     Top = 368
     Width = 72
+    Anchors = [akTop, akRight]
     ItemHeight = 0
     ItemIndex = 0
     Items.Strings = (
@@ -93,6 +100,7 @@ object ScanForm: TScanForm
     Height = 16
     Top = 376
     Width = 19
+    Anchors = [akTop, akRight]
     Caption = 'dpi'
     ParentColor = False
   end
@@ -101,6 +109,7 @@ object ScanForm: TScanForm
     Height = 19
     Top = 816
     Width = 88
+    Anchors = [akLeft, akBottom]
     Caption = 'BaseFolder'
     Font.Height = -16
     Font.Name = 'Sans'
@@ -113,6 +122,7 @@ object ScanForm: TScanForm
     Height = 28
     Top = 272
     Width = 272
+    Anchors = [akTop, akRight]
     Enabled = False
     ItemHeight = 0
     OnChange = StopChange
@@ -124,6 +134,7 @@ object ScanForm: TScanForm
     Height = 800
     Top = 8
     Width = 880
+    Anchors = [akTop, akLeft, akRight, akBottom]
     Center = True
     Proportional = True
   end
@@ -132,6 +143,7 @@ object ScanForm: TScanForm
     Height = 190
     Top = 8
     Width = 276
+    Anchors = [akTop, akRight]
     DateTime = 0
     OnChange = CalendarChange
     TabOrder = 0
@@ -141,6 +153,7 @@ object ScanForm: TScanForm
     Height = 28
     Top = 336
     Width = 272
+    Anchors = [akTop, akRight]
     ItemHeight = 0
     TabOrder = 6
     Text = '209 x 297 mm'
@@ -150,6 +163,7 @@ object ScanForm: TScanForm
     Height = 32
     Top = 776
     Width = 276
+    Anchors = [akRight, akBottom]
     Caption = 'Löschen'
     Enabled = False
     OnClick = DropButtonClick
@@ -162,6 +176,7 @@ object ScanForm: TScanForm
     Height = 30
     Top = 368
     Width = 128
+    Anchors = [akTop, akRight]
     Caption = 'Start/Ziel tauschen'
     OnClick = SwapClick
     TabOrder = 10
@@ -171,6 +186,7 @@ object ScanForm: TScanForm
     Height = 49
     Top = 456
     Width = 272
+    Anchors = [akTop, akRight]
     Caption = 'extern öffnen'
     Enabled = False
     OnClick = extButtonClick
diff --git a/scanner.pas b/scanner.pas
index de8a4c4..8970e1c 100644
--- a/scanner.pas
+++ b/scanner.pas
@@ -154,16 +154,18 @@ begin
   Result := Result + 'types:' + ExportOptions(TypeSelector) + #13;
   Result := Result + 'items:' + ExportOptions(Product) + #13;
   MixLocations(Origin, Destination, Stop);
-  Result := Result + 'locations:' + ExportOPtions(Origin) + #13;
+  Result := Result + 'locations:' + ExportOptions(Origin) + #13;
   Result := Result + 'sizes:' + ExportOptions(PicSize) +#13;
 end;
 
 function TScanForm.ExportOptions(dropDown: TComboBox): string;
 var
   list: TStringList;
+  tx: string;
 begin
   // make sure the current text appears in future lists
-  dropDown.Items.Add(dropDown.Text);
+  tx := dropDown.Text;
+  if (tx[1] <> ' ') then dropDown.Items.Add(tx);
   // create a StringList to sort and concatenate
   list := TStringList.Create;
   list.StrictDelimiter := True;
@@ -352,15 +354,15 @@ var
 begin
   tx := FormatDateTime('YYYY-MM-DD', date) + ' - ';
   if (Product.Enabled and (Product.Tag > 0) and not( Product.Text = '') and not (Product.Text = 'Produkt')) then
-    tx := tx + Product.Text + ' von ';
+    tx := tx + Trim(Product.Text) + ' von ';
   if (TypeSelector.Tag > 0) then
-    tx := tx + TypeSelector.Text;
+    tx := tx + Trim(TypeSelector.Text);
   if (Origin.Enabled and (Origin.Tag > 0)) then
-    tx := tx + ': ' + Origin.Text;
+    tx := tx + ': ' + Trim(Origin.Text);
   if (Stop.Enabled and (Stop.Tag > 0) and not (Stop.Text = '')and not (Stop.Text = 'Zwischenhalt')) then
-    tx := tx + ' - ' + Stop.Text;
+    tx := tx + ' - ' + Trim(Stop.Text);
   if (Destination.Enabled and (Destination.Tag > 0)) then
-    tx := tx + ' - ' + Destination.Text;
+    tx := tx + ' - ' + Trim(Destination.Text);
   FolderName.Caption := tx;
 end;