diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb
index a83050c..38bec39 100644
--- a/DDUserManager/DDUserManager/frmMain.Designer.vb
+++ b/DDUserManager/DDUserManager/frmMain.Designer.vb
@@ -547,7 +547,7 @@ Partial Class frmMain
         'USERNAMELabel
         '
         USERNAMELabel.AutoSize = True
-        USERNAMELabel.Location = New System.Drawing.Point(238, 67)
+        USERNAMELabel.Location = New System.Drawing.Point(285, 68)
         USERNAMELabel.Name = "USERNAMELabel"
         USERNAMELabel.Size = New System.Drawing.Size(80, 13)
         USERNAMELabel.TabIndex = 6
@@ -556,7 +556,7 @@ Partial Class frmMain
         'SHORTNAMELabel
         '
         SHORTNAMELabel.AutoSize = True
-        SHORTNAMELabel.Location = New System.Drawing.Point(238, 94)
+        SHORTNAMELabel.Location = New System.Drawing.Point(285, 95)
         SHORTNAMELabel.Name = "SHORTNAMELabel"
         SHORTNAMELabel.Size = New System.Drawing.Size(40, 13)
         SHORTNAMELabel.TabIndex = 8
@@ -575,7 +575,7 @@ Partial Class frmMain
         'LANGUAGELabel
         '
         LANGUAGELabel.AutoSize = True
-        LANGUAGELabel.Location = New System.Drawing.Point(238, 120)
+        LANGUAGELabel.Location = New System.Drawing.Point(285, 121)
         LANGUAGELabel.Name = "LANGUAGELabel"
         LANGUAGELabel.Size = New System.Drawing.Size(50, 13)
         LANGUAGELabel.TabIndex = 12
@@ -584,7 +584,7 @@ Partial Class frmMain
         'COMMENTLabel
         '
         COMMENTLabel.AutoSize = True
-        COMMENTLabel.Location = New System.Drawing.Point(238, 147)
+        COMMENTLabel.Location = New System.Drawing.Point(285, 148)
         COMMENTLabel.Name = "COMMENTLabel"
         COMMENTLabel.Size = New System.Drawing.Size(65, 13)
         COMMENTLabel.TabIndex = 16
@@ -926,7 +926,7 @@ Partial Class frmMain
         Me.LANGUAGEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "LANGUAGE", True))
         Me.LANGUAGEComboBox.FormattingEnabled = True
         Me.LANGUAGEComboBox.Items.AddRange(New Object() {"de-DE", "en-US"})
-        Me.LANGUAGEComboBox.Location = New System.Drawing.Point(347, 117)
+        Me.LANGUAGEComboBox.Location = New System.Drawing.Point(394, 118)
         Me.LANGUAGEComboBox.Name = "LANGUAGEComboBox"
         Me.LANGUAGEComboBox.Size = New System.Drawing.Size(109, 21)
         Me.LANGUAGEComboBox.TabIndex = 55
@@ -984,7 +984,7 @@ Partial Class frmMain
         Me.PRENAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "PRENAME", True))
         Me.PRENAMETextBox.Location = New System.Drawing.Point(106, 64)
         Me.PRENAMETextBox.Name = "PRENAMETextBox"
-        Me.PRENAMETextBox.Size = New System.Drawing.Size(109, 21)
+        Me.PRENAMETextBox.Size = New System.Drawing.Size(160, 21)
         Me.PRENAMETextBox.TabIndex = 3
         '
         'EMAILTextBox
@@ -992,7 +992,7 @@ Partial Class frmMain
         Me.EMAILTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "EMAIL", True))
         Me.EMAILTextBox.Location = New System.Drawing.Point(106, 117)
         Me.EMAILTextBox.Name = "EMAILTextBox"
-        Me.EMAILTextBox.Size = New System.Drawing.Size(109, 21)
+        Me.EMAILTextBox.Size = New System.Drawing.Size(160, 21)
         Me.EMAILTextBox.TabIndex = 11
         '
         'ADDED_WHOTextBox
@@ -1017,9 +1017,9 @@ Partial Class frmMain
         'COMMENTTextBox
         '
         Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "COMMENT", True))
-        Me.COMMENTTextBox.Location = New System.Drawing.Point(347, 144)
+        Me.COMMENTTextBox.Location = New System.Drawing.Point(394, 145)
         Me.COMMENTTextBox.Name = "COMMENTTextBox"
-        Me.COMMENTTextBox.Size = New System.Drawing.Size(109, 21)
+        Me.COMMENTTextBox.Size = New System.Drawing.Size(144, 21)
         Me.COMMENTTextBox.TabIndex = 17
         '
         'NAMETextBox
@@ -1027,23 +1027,23 @@ Partial Class frmMain
         Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "NAME", True))
         Me.NAMETextBox.Location = New System.Drawing.Point(106, 91)
         Me.NAMETextBox.Name = "NAMETextBox"
-        Me.NAMETextBox.Size = New System.Drawing.Size(109, 21)
+        Me.NAMETextBox.Size = New System.Drawing.Size(160, 21)
         Me.NAMETextBox.TabIndex = 5
         '
         'USERNAMETextBox
         '
         Me.USERNAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "USERNAME", True))
-        Me.USERNAMETextBox.Location = New System.Drawing.Point(347, 64)
+        Me.USERNAMETextBox.Location = New System.Drawing.Point(394, 65)
         Me.USERNAMETextBox.Name = "USERNAMETextBox"
-        Me.USERNAMETextBox.Size = New System.Drawing.Size(109, 21)
+        Me.USERNAMETextBox.Size = New System.Drawing.Size(144, 21)
         Me.USERNAMETextBox.TabIndex = 7
         '
         'SHORTNAMETextBox
         '
         Me.SHORTNAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "SHORTNAME", True))
-        Me.SHORTNAMETextBox.Location = New System.Drawing.Point(347, 91)
+        Me.SHORTNAMETextBox.Location = New System.Drawing.Point(394, 92)
         Me.SHORTNAMETextBox.Name = "SHORTNAMETextBox"
-        Me.SHORTNAMETextBox.Size = New System.Drawing.Size(109, 21)
+        Me.SHORTNAMETextBox.Size = New System.Drawing.Size(144, 21)
         Me.SHORTNAMETextBox.TabIndex = 9
         '
         'Label12
@@ -2279,7 +2279,7 @@ Partial Class frmMain
         Me.NAMETextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_GROUPSBindingSource1, "NAME", True))
         Me.NAMETextBox1.Location = New System.Drawing.Point(106, 64)
         Me.NAMETextBox1.Name = "NAMETextBox1"
-        Me.NAMETextBox1.Size = New System.Drawing.Size(128, 21)
+        Me.NAMETextBox1.Size = New System.Drawing.Size(409, 21)
         Me.NAMETextBox1.TabIndex = 4
         '
         'TextBox3
@@ -2296,7 +2296,7 @@ Partial Class frmMain
         Me.COMMENTTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_GROUPSBindingSource1, "COMMENT", True))
         Me.COMMENTTextBox1.Location = New System.Drawing.Point(106, 91)
         Me.COMMENTTextBox1.Name = "COMMENTTextBox1"
-        Me.COMMENTTextBox1.Size = New System.Drawing.Size(128, 21)
+        Me.COMMENTTextBox1.Size = New System.Drawing.Size(409, 21)
         Me.COMMENTTextBox1.TabIndex = 6
         '
         'ADDED_WHOTextBox1
@@ -3066,7 +3066,7 @@ Partial Class frmMain
         Me.CLIENT_NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "CLIENT_NAME", True))
         Me.CLIENT_NAMETextBox.Location = New System.Drawing.Point(106, 64)
         Me.CLIENT_NAMETextBox.Name = "CLIENT_NAMETextBox"
-        Me.CLIENT_NAMETextBox.Size = New System.Drawing.Size(109, 21)
+        Me.CLIENT_NAMETextBox.Size = New System.Drawing.Size(408, 21)
         Me.CLIENT_NAMETextBox.TabIndex = 3
         '
         'CHANGED_WHOTextBox2
@@ -3083,7 +3083,7 @@ Partial Class frmMain
         Me.SHORTNAMETextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "SHORTNAME", True))
         Me.SHORTNAMETextBox1.Location = New System.Drawing.Point(106, 91)
         Me.SHORTNAMETextBox1.Name = "SHORTNAMETextBox1"
-        Me.SHORTNAMETextBox1.Size = New System.Drawing.Size(109, 21)
+        Me.SHORTNAMETextBox1.Size = New System.Drawing.Size(408, 21)
         Me.SHORTNAMETextBox1.TabIndex = 5
         '
         'TextBox6
@@ -3100,7 +3100,7 @@ Partial Class frmMain
         Me.COMMENTTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CLIENTBindingSource, "COMMENT", True))
         Me.COMMENTTextBox2.Location = New System.Drawing.Point(106, 118)
         Me.COMMENTTextBox2.Name = "COMMENTTextBox2"
-        Me.COMMENTTextBox2.Size = New System.Drawing.Size(109, 21)
+        Me.COMMENTTextBox2.Size = New System.Drawing.Size(408, 21)
         Me.COMMENTTextBox2.TabIndex = 7
         '
         'TextBox5
diff --git a/DDUserManager/DDUserManager/frmMain.resx b/DDUserManager/DDUserManager/frmMain.resx
index b72d482..3c5e5c9 100644
--- a/DDUserManager/DDUserManager/frmMain.resx
+++ b/DDUserManager/DDUserManager/frmMain.resx
@@ -213,36 +213,9 @@
   <metadata name="PRODUCT_VERSIONLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="TBDD_USERBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>693, 17</value>
-  </metadata>
-  <metadata name="TBDD_GROUPSBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 95</value>
-  </metadata>
-  <metadata name="TBDD_CLIENTBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>247, 95</value>
-  </metadata>
-  <metadata name="TBDD_MODULESBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>909, 95</value>
-  </metadata>
   <metadata name="TBDD_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>136, 17</value>
   </metadata>
-  <metadata name="TBDD_MODULESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>469, 95</value>
-  </metadata>
-  <metadata name="TBDD_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>489, 56</value>
-  </metadata>
-  <metadata name="TBDD_CLIENTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>911, 56</value>
-  </metadata>
-  <metadata name="TBDD_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>136, 17</value>
-  </metadata>
-  <metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -261,9 +234,6 @@
   <metadata name="DS_ChangeS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>906, 134</value>
   </metadata>
-  <metadata name="DS_ChangeS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>906, 134</value>
-  </metadata>
   <metadata name="TBDD_USERBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>693, 17</value>
   </metadata>