diff --git a/App/EmailProfiler.Form/frmMain.Designer.vb b/App/EmailProfiler.Form/frmMain.Designer.vb
index 65cf4f3..3c6a243 100644
--- a/App/EmailProfiler.Form/frmMain.Designer.vb
+++ b/App/EmailProfiler.Form/frmMain.Designer.vb
@@ -1693,7 +1693,6 @@ Partial Class frmMain
         Me.BindingNavigator2.CountItem = Me.ToolStripLabel1
         Me.BindingNavigator2.CountItemFormat = "von {0} Prozessen"
         Me.BindingNavigator2.DeleteItem = Me.ToolStripButton3
-        Me.BindingNavigator2.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.BindingNavigator2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton4, Me.ToolStripButton5, Me.ToolStripSeparator1, Me.ToolStripTextBox1, Me.ToolStripLabel1, Me.ToolStripSeparator2, Me.ToolStripButton6, Me.ToolStripButton7, Me.ToolStripSeparator3, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripButton8, Me.ToolStripButton10})
         Me.BindingNavigator2.Location = New System.Drawing.Point(245, 0)
         Me.BindingNavigator2.MoveFirstItem = Me.ToolStripButton4
@@ -1702,7 +1701,7 @@ Partial Class frmMain
         Me.BindingNavigator2.MovePreviousItem = Me.ToolStripButton5
         Me.BindingNavigator2.Name = "BindingNavigator2"
         Me.BindingNavigator2.PositionItem = Me.ToolStripTextBox1
-        Me.BindingNavigator2.Size = New System.Drawing.Size(1065, 31)
+        Me.BindingNavigator2.Size = New System.Drawing.Size(1065, 25)
         Me.BindingNavigator2.TabIndex = 32
         Me.BindingNavigator2.Text = "BindingNavigator2"
         '
@@ -1712,13 +1711,13 @@ Partial Class frmMain
         Me.ToolStripButton2.Image = CType(resources.GetObject("ToolStripButton2.Image"), System.Drawing.Image)
         Me.ToolStripButton2.Name = "ToolStripButton2"
         Me.ToolStripButton2.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton2.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton2.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton2.Text = "Neu hinzufügen"
         '
         'ToolStripLabel1
         '
         Me.ToolStripLabel1.Name = "ToolStripLabel1"
-        Me.ToolStripLabel1.Size = New System.Drawing.Size(99, 28)
+        Me.ToolStripLabel1.Size = New System.Drawing.Size(99, 22)
         Me.ToolStripLabel1.Text = "von {0} Prozessen"
         Me.ToolStripLabel1.ToolTipText = "Die Gesamtanzahl der Elemente."
         '
@@ -1728,7 +1727,7 @@ Partial Class frmMain
         Me.ToolStripButton3.Image = CType(resources.GetObject("ToolStripButton3.Image"), System.Drawing.Image)
         Me.ToolStripButton3.Name = "ToolStripButton3"
         Me.ToolStripButton3.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton3.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton3.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton3.Text = "Löschen"
         '
         'ToolStripButton4
@@ -1737,7 +1736,7 @@ Partial Class frmMain
         Me.ToolStripButton4.Image = CType(resources.GetObject("ToolStripButton4.Image"), System.Drawing.Image)
         Me.ToolStripButton4.Name = "ToolStripButton4"
         Me.ToolStripButton4.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton4.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton4.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton4.Text = "Erste verschieben"
         '
         'ToolStripButton5
@@ -1746,13 +1745,13 @@ Partial Class frmMain
         Me.ToolStripButton5.Image = CType(resources.GetObject("ToolStripButton5.Image"), System.Drawing.Image)
         Me.ToolStripButton5.Name = "ToolStripButton5"
         Me.ToolStripButton5.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton5.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton5.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton5.Text = "Vorherige verschieben"
         '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
         '
         'ToolStripTextBox1
         '
@@ -1767,7 +1766,7 @@ Partial Class frmMain
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
         '
         'ToolStripButton6
         '
@@ -1775,7 +1774,7 @@ Partial Class frmMain
         Me.ToolStripButton6.Image = CType(resources.GetObject("ToolStripButton6.Image"), System.Drawing.Image)
         Me.ToolStripButton6.Name = "ToolStripButton6"
         Me.ToolStripButton6.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton6.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton6.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton6.Text = "Nächste verschieben"
         '
         'ToolStripButton7
@@ -1784,13 +1783,13 @@ Partial Class frmMain
         Me.ToolStripButton7.Image = CType(resources.GetObject("ToolStripButton7.Image"), System.Drawing.Image)
         Me.ToolStripButton7.Name = "ToolStripButton7"
         Me.ToolStripButton7.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton7.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton7.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton7.Text = "Letzte verschieben"
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
         '
         'ToolStripButton8
         '
@@ -1798,7 +1797,7 @@ Partial Class frmMain
         Me.ToolStripButton8.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
         Me.ToolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton8.Name = "ToolStripButton8"
-        Me.ToolStripButton8.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton8.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton8.Text = "ToolStripButton1"
         '
         'ToolStripButton10
@@ -1807,7 +1806,7 @@ Partial Class frmMain
         Me.ToolStripButton10.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG
         Me.ToolStripButton10.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton10.Name = "ToolStripButton10"
-        Me.ToolStripButton10.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton10.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton10.Text = "Refresh"
         '
         'GridControl1
@@ -1951,7 +1950,6 @@ Partial Class frmMain
         Me.BindingNavigator3.CountItem = Me.ToolStripLabel2
         Me.BindingNavigator3.CountItemFormat = "von {0} möglichen Verarbeitungsschritten"
         Me.BindingNavigator3.DeleteItem = Me.ToolStripButton12
-        Me.BindingNavigator3.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.BindingNavigator3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton13, Me.ToolStripButton14, Me.ToolStripSeparator4, Me.ToolStripTextBox2, Me.ToolStripLabel2, Me.ToolStripSeparator5, Me.ToolStripButton15, Me.ToolStripButton16, Me.ToolStripSeparator6, Me.ToolStripButton11, Me.ToolStripButton12, Me.ToolStripButton17, Me.ToolStripButton18})
         Me.BindingNavigator3.Location = New System.Drawing.Point(245, 0)
         Me.BindingNavigator3.MoveFirstItem = Me.ToolStripButton13
@@ -1960,7 +1958,7 @@ Partial Class frmMain
         Me.BindingNavigator3.MovePreviousItem = Me.ToolStripButton14
         Me.BindingNavigator3.Name = "BindingNavigator3"
         Me.BindingNavigator3.PositionItem = Me.ToolStripTextBox2
-        Me.BindingNavigator3.Size = New System.Drawing.Size(974, 31)
+        Me.BindingNavigator3.Size = New System.Drawing.Size(974, 25)
         Me.BindingNavigator3.TabIndex = 33
         Me.BindingNavigator3.Text = "BindingNavigator3"
         '
@@ -1970,13 +1968,13 @@ Partial Class frmMain
         Me.ToolStripButton11.Image = CType(resources.GetObject("ToolStripButton11.Image"), System.Drawing.Image)
         Me.ToolStripButton11.Name = "ToolStripButton11"
         Me.ToolStripButton11.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton11.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton11.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton11.Text = "Neu hinzufügen"
         '
         'ToolStripLabel2
         '
         Me.ToolStripLabel2.Name = "ToolStripLabel2"
-        Me.ToolStripLabel2.Size = New System.Drawing.Size(225, 28)
+        Me.ToolStripLabel2.Size = New System.Drawing.Size(225, 22)
         Me.ToolStripLabel2.Text = "von {0} möglichen Verarbeitungsschritten"
         Me.ToolStripLabel2.ToolTipText = "Die Gesamtanzahl der Elemente."
         '
@@ -1986,7 +1984,7 @@ Partial Class frmMain
         Me.ToolStripButton12.Image = CType(resources.GetObject("ToolStripButton12.Image"), System.Drawing.Image)
         Me.ToolStripButton12.Name = "ToolStripButton12"
         Me.ToolStripButton12.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton12.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton12.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton12.Text = "Löschen"
         '
         'ToolStripButton13
@@ -1995,7 +1993,7 @@ Partial Class frmMain
         Me.ToolStripButton13.Image = CType(resources.GetObject("ToolStripButton13.Image"), System.Drawing.Image)
         Me.ToolStripButton13.Name = "ToolStripButton13"
         Me.ToolStripButton13.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton13.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton13.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton13.Text = "Erste verschieben"
         '
         'ToolStripButton14
@@ -2004,13 +2002,13 @@ Partial Class frmMain
         Me.ToolStripButton14.Image = CType(resources.GetObject("ToolStripButton14.Image"), System.Drawing.Image)
         Me.ToolStripButton14.Name = "ToolStripButton14"
         Me.ToolStripButton14.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton14.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton14.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton14.Text = "Vorherige verschieben"
         '
         'ToolStripSeparator4
         '
         Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
-        Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 31)
+        Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 25)
         '
         'ToolStripTextBox2
         '
@@ -2025,7 +2023,7 @@ Partial Class frmMain
         'ToolStripSeparator5
         '
         Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
-        Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 31)
+        Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 25)
         '
         'ToolStripButton15
         '
@@ -2033,7 +2031,7 @@ Partial Class frmMain
         Me.ToolStripButton15.Image = CType(resources.GetObject("ToolStripButton15.Image"), System.Drawing.Image)
         Me.ToolStripButton15.Name = "ToolStripButton15"
         Me.ToolStripButton15.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton15.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton15.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton15.Text = "Nächste verschieben"
         '
         'ToolStripButton16
@@ -2042,13 +2040,13 @@ Partial Class frmMain
         Me.ToolStripButton16.Image = CType(resources.GetObject("ToolStripButton16.Image"), System.Drawing.Image)
         Me.ToolStripButton16.Name = "ToolStripButton16"
         Me.ToolStripButton16.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton16.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton16.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton16.Text = "Letzte verschieben"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(6, 31)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(6, 25)
         '
         'ToolStripButton17
         '
@@ -2056,7 +2054,7 @@ Partial Class frmMain
         Me.ToolStripButton17.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
         Me.ToolStripButton17.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton17.Name = "ToolStripButton17"
-        Me.ToolStripButton17.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton17.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton17.Text = "ToolStripButton1"
         '
         'ToolStripButton18
@@ -2065,7 +2063,7 @@ Partial Class frmMain
         Me.ToolStripButton18.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG
         Me.ToolStripButton18.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton18.Name = "ToolStripButton18"
-        Me.ToolStripButton18.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton18.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton18.Text = "Refresh"
         '
         'GUIDPollStepsTextBox
@@ -2291,7 +2289,6 @@ Partial Class frmMain
         Me.BindingNavigator4.CountItem = Me.ToolStripLabel3
         Me.BindingNavigator4.CountItemFormat = "von {0} Indexierungsschritten"
         Me.BindingNavigator4.DeleteItem = Me.ToolStripButton20
-        Me.BindingNavigator4.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.BindingNavigator4.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton21, Me.ToolStripButton22, Me.ToolStripSeparator7, Me.ToolStripTextBox3, Me.ToolStripLabel3, Me.ToolStripSeparator8, Me.ToolStripButton23, Me.ToolStripButton24, Me.ToolStripSeparator9, Me.ToolStripButton19, Me.ToolStripButton20, Me.ToolStripButton25, Me.ToolStripButton26})
         Me.BindingNavigator4.Location = New System.Drawing.Point(245, 0)
         Me.BindingNavigator4.MoveFirstItem = Me.ToolStripButton21
@@ -2300,7 +2297,7 @@ Partial Class frmMain
         Me.BindingNavigator4.MovePreviousItem = Me.ToolStripButton22
         Me.BindingNavigator4.Name = "BindingNavigator4"
         Me.BindingNavigator4.PositionItem = Me.ToolStripTextBox3
-        Me.BindingNavigator4.Size = New System.Drawing.Size(974, 31)
+        Me.BindingNavigator4.Size = New System.Drawing.Size(1471, 25)
         Me.BindingNavigator4.TabIndex = 35
         Me.BindingNavigator4.Text = "BindingNavigator4"
         '
@@ -2310,13 +2307,13 @@ Partial Class frmMain
         Me.ToolStripButton19.Image = CType(resources.GetObject("ToolStripButton19.Image"), System.Drawing.Image)
         Me.ToolStripButton19.Name = "ToolStripButton19"
         Me.ToolStripButton19.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton19.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton19.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton19.Text = "Neu hinzufügen"
         '
         'ToolStripLabel3
         '
         Me.ToolStripLabel3.Name = "ToolStripLabel3"
-        Me.ToolStripLabel3.Size = New System.Drawing.Size(160, 28)
+        Me.ToolStripLabel3.Size = New System.Drawing.Size(160, 22)
         Me.ToolStripLabel3.Text = "von {0} Indexierungsschritten"
         Me.ToolStripLabel3.ToolTipText = "Die Gesamtanzahl der Elemente."
         '
@@ -2326,7 +2323,7 @@ Partial Class frmMain
         Me.ToolStripButton20.Image = CType(resources.GetObject("ToolStripButton20.Image"), System.Drawing.Image)
         Me.ToolStripButton20.Name = "ToolStripButton20"
         Me.ToolStripButton20.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton20.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton20.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton20.Text = "Löschen"
         '
         'ToolStripButton21
@@ -2335,7 +2332,7 @@ Partial Class frmMain
         Me.ToolStripButton21.Image = CType(resources.GetObject("ToolStripButton21.Image"), System.Drawing.Image)
         Me.ToolStripButton21.Name = "ToolStripButton21"
         Me.ToolStripButton21.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton21.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton21.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton21.Text = "Erste verschieben"
         '
         'ToolStripButton22
@@ -2344,13 +2341,13 @@ Partial Class frmMain
         Me.ToolStripButton22.Image = CType(resources.GetObject("ToolStripButton22.Image"), System.Drawing.Image)
         Me.ToolStripButton22.Name = "ToolStripButton22"
         Me.ToolStripButton22.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton22.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton22.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton22.Text = "Vorherige verschieben"
         '
         'ToolStripSeparator7
         '
         Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
-        Me.ToolStripSeparator7.Size = New System.Drawing.Size(6, 31)
+        Me.ToolStripSeparator7.Size = New System.Drawing.Size(6, 25)
         '
         'ToolStripTextBox3
         '
@@ -2365,7 +2362,7 @@ Partial Class frmMain
         'ToolStripSeparator8
         '
         Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
-        Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 31)
+        Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 25)
         '
         'ToolStripButton23
         '
@@ -2373,7 +2370,7 @@ Partial Class frmMain
         Me.ToolStripButton23.Image = CType(resources.GetObject("ToolStripButton23.Image"), System.Drawing.Image)
         Me.ToolStripButton23.Name = "ToolStripButton23"
         Me.ToolStripButton23.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton23.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton23.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton23.Text = "Nächste verschieben"
         '
         'ToolStripButton24
@@ -2382,13 +2379,13 @@ Partial Class frmMain
         Me.ToolStripButton24.Image = CType(resources.GetObject("ToolStripButton24.Image"), System.Drawing.Image)
         Me.ToolStripButton24.Name = "ToolStripButton24"
         Me.ToolStripButton24.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton24.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton24.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton24.Text = "Letzte verschieben"
         '
         'ToolStripSeparator9
         '
         Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
-        Me.ToolStripSeparator9.Size = New System.Drawing.Size(6, 31)
+        Me.ToolStripSeparator9.Size = New System.Drawing.Size(6, 25)
         '
         'ToolStripButton25
         '
@@ -2396,7 +2393,7 @@ Partial Class frmMain
         Me.ToolStripButton25.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
         Me.ToolStripButton25.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton25.Name = "ToolStripButton25"
-        Me.ToolStripButton25.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton25.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton25.Text = "ToolStripButton1"
         '
         'ToolStripButton26
@@ -2405,7 +2402,7 @@ Partial Class frmMain
         Me.ToolStripButton26.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG
         Me.ToolStripButton26.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton26.Name = "ToolStripButton26"
-        Me.ToolStripButton26.Size = New System.Drawing.Size(28, 28)
+        Me.ToolStripButton26.Size = New System.Drawing.Size(23, 22)
         Me.ToolStripButton26.Text = "Refresh"
         '
         'GridControl3
@@ -2415,7 +2412,7 @@ Partial Class frmMain
         Me.GridControl3.Location = New System.Drawing.Point(0, 0)
         Me.GridControl3.MainView = Me.GridView3
         Me.GridControl3.Name = "GridControl3"
-        Me.GridControl3.Size = New System.Drawing.Size(245, 337)
+        Me.GridControl3.Size = New System.Drawing.Size(245, 320)
         Me.GridControl3.TabIndex = 34
         Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3})
         '