diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
index 3974596a..95cb7691 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
@@ -68,8 +68,9 @@ Partial Public Class frmEnvelopeEditor
         Me.colColor = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.RepositoryItemColorEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorEdit()
         Me.colEmail = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.RepositoryItemEmailEdit = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
+        Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
         Me.colName = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.RepositoryItemEmailEdit = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
         Me.RepositoryItemPictureEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit()
         Me.RepositoryItemColorPickEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit()
         Me.RepositoryItemImageEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemImageEdit()
@@ -88,7 +89,6 @@ Partial Public Class frmEnvelopeEditor
         Me.FrmEditorBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.EnvelopeDocumentBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
-        Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl1.Panel1.SuspendLayout()
@@ -117,6 +117,7 @@ Partial Public Class frmEnvelopeEditor
         CType(Me.EnvelopeReceiverBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemEmailEdit, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemPictureEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemColorPickEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -137,7 +138,6 @@ Partial Public Class frmEnvelopeEditor
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.FrmEditorBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.EnvelopeDocumentBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'SplashScreenManager1
@@ -436,10 +436,11 @@ Partial Public Class frmEnvelopeEditor
         Me.colEmail.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False]
         resources.ApplyResources(Me.colEmail, "colEmail")
         '
-        'RepositoryItemEmailEdit
+        'RepositoryItemComboBox1
         '
-        resources.ApplyResources(Me.RepositoryItemEmailEdit, "RepositoryItemEmailEdit")
-        Me.RepositoryItemEmailEdit.Name = "RepositoryItemEmailEdit"
+        resources.ApplyResources(Me.RepositoryItemComboBox1, "RepositoryItemComboBox1")
+        Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))})
+        Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1"
         '
         'colName
         '
@@ -448,6 +449,11 @@ Partial Public Class frmEnvelopeEditor
         Me.colName.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False]
         resources.ApplyResources(Me.colName, "colName")
         '
+        'RepositoryItemEmailEdit
+        '
+        resources.ApplyResources(Me.RepositoryItemEmailEdit, "RepositoryItemEmailEdit")
+        Me.RepositoryItemEmailEdit.Name = "RepositoryItemEmailEdit"
+        '
         'RepositoryItemPictureEdit1
         '
         Me.RepositoryItemPictureEdit1.Name = "RepositoryItemPictureEdit1"
@@ -582,12 +588,6 @@ Partial Public Class frmEnvelopeEditor
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         resources.ApplyResources(Me.OpenFileDialog1, "OpenFileDialog1")
         '
-        'RepositoryItemComboBox1
-        '
-        resources.ApplyResources(Me.RepositoryItemComboBox1, "RepositoryItemComboBox1")
-        Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))})
-        Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1"
-        '
         'frmEnvelopeEditor
         '
         resources.ApplyResources(Me, "$this")
@@ -625,6 +625,7 @@ Partial Public Class frmEnvelopeEditor
         CType(Me.EnvelopeReceiverBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemEmailEdit, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemPictureEdit1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemColorPickEdit1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -645,7 +646,6 @@ Partial Public Class frmEnvelopeEditor
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.FrmEditorBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.EnvelopeDocumentBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
index 500e0b93..4705ceda 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
@@ -831,6 +831,9 @@
         b3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterScreen</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Sign Flow - Umschlag-Editor</value>
   </data>
@@ -990,11 +993,11 @@
   <data name="&gt;&gt;colEmail.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RepositoryItemEmailEdit.Name" xml:space="preserve">
-    <value>RepositoryItemEmailEdit</value>
+  <data name="&gt;&gt;RepositoryItemComboBox1.Name" xml:space="preserve">
+    <value>RepositoryItemComboBox1</value>
   </data>
-  <data name="&gt;&gt;RepositoryItemEmailEdit.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="&gt;&gt;RepositoryItemComboBox1.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colName.Name" xml:space="preserve">
     <value>colName</value>
@@ -1002,6 +1005,12 @@
   <data name="&gt;&gt;colName.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;RepositoryItemEmailEdit.Name" xml:space="preserve">
+    <value>RepositoryItemEmailEdit</value>
+  </data>
+  <data name="&gt;&gt;RepositoryItemEmailEdit.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RepositoryItemPictureEdit1.Name" xml:space="preserve">
     <value>RepositoryItemPictureEdit1</value>
   </data>
@@ -1086,12 +1095,6 @@
   <data name="&gt;&gt;OpenFileDialog1.Type" xml:space="preserve">
     <value>System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;RepositoryItemComboBox1.Name" xml:space="preserve">
-    <value>RepositoryItemComboBox1</value>
-  </data>
-  <data name="&gt;&gt;RepositoryItemComboBox1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmEnvelopeEditor</value>
   </data>
diff --git a/EnvelopeGenerator.Form/frmFieldEditor.resx b/EnvelopeGenerator.Form/frmFieldEditor.resx
index d3c29d02..306121e4 100644
--- a/EnvelopeGenerator.Form/frmFieldEditor.resx
+++ b/EnvelopeGenerator.Form/frmFieldEditor.resx
@@ -471,6 +471,9 @@
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>1125, 658</value>
   </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterScreen</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Sign Flow - Signatur-Editor</value>
   </data>