diff --git a/app/.vs/DD_PM_WINDREAM/DesignTimeBuild/.dtbcache b/app/.vs/DD_PM_WINDREAM/DesignTimeBuild/.dtbcache
index 715c91b..671ed4a 100644
Binary files a/app/.vs/DD_PM_WINDREAM/DesignTimeBuild/.dtbcache and b/app/.vs/DD_PM_WINDREAM/DesignTimeBuild/.dtbcache differ
diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb
index 23de30f..2f713a6 100644
--- a/app/DD_PM_WINDREAM/frmMassValidator.vb
+++ b/app/DD_PM_WINDREAM/frmMassValidator.vb
@@ -58,7 +58,7 @@ Public Class frmMassValidator
             Size = My.Settings.frmMassValidatorSize
         End If
         Try
-            DTCONTROLS = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE_CONTROLS WHERE SQL_UEBERPRUEFUNG NOT LIKE '%WMI%' AND PROFIL_ID = " & CURRENT_ProfilGUID)
+            DTCONTROLS = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE_CONTROLS WHERE SQL_UEBERPRUEFUNG NOT LIKE '%WMI%' AND PROFIL_ID = " & CURRENT_ProfilGUID & " ORDER BY Y_LOC, X_LOC")
             LOGGER.Debug("Profile Data geladen")
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -132,6 +132,8 @@ Public Class frmMassValidator
         Try
             pnldesigner.Controls.Clear()
 
+            Dim oCount = 0
+
             For Each oControlRow As DataRow In DTCONTROLS.Rows
                 Dim ctrl As Control
 
@@ -330,16 +332,13 @@ Public Class frmMassValidator
                         ctrl = ClassControlCreator.CreateExistingGridControl(oControlRow, columns, False)
                 End Select
 
-                If TypeOf ctrl IsNot Label Then
-                    ' If first_control Is Nothing Then
-                    'first_control = ctrl
-                    'End If
-                    'last_control = ctrl
+                If ctrl IsNot Nothing AndAlso TypeOf ctrl IsNot Label Then
+                    ctrl.TabIndex = oCount
                 End If
 
                 pnldesigner.Controls.Add(ctrl)
 
-
+                oCount += 1
             Next
             LOGGER.Debug("Controls geladen")
             LOGGER.Info("")
@@ -351,9 +350,7 @@ Public Class frmMassValidator
         Catch ex As Exception
             LOGGER.Info("Unvorhergesehener Fehler bei Load_Controls:" & ex.Message)
             LOGGER.Info("")
-
         End Try
-
     End Sub
     Public Sub onLookUp1(sender As Object, SelectedValues As List(Of String))
         If FORM_Shown = False Then