diff --git a/app/TaskFlow/ClassInit.vb b/app/TaskFlow/ClassInit.vb
index 2f7262f..99bb574 100644
--- a/app/TaskFlow/ClassInit.vb
+++ b/app/TaskFlow/ClassInit.vb
@@ -312,8 +312,8 @@ Public Class ClassInit
             End Try
 
             LOGGER.Debug("Username: " & USER_USERNAME)
-            Dim oFnct As New RefreshHelper.SW("FNDD_CHECK_USER_MODULE")
-            oSQL = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
+            Dim oFnct As New RefreshHelper.SW("FNDD_LOGIN_USER_MODULE")
+            oSQL = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
             Dim DT_CHECKUSER_MODULE As DataTable
 
 
diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb
index 08b6417..e553fe3 100644
--- a/app/TaskFlow/frmMain.vb
+++ b/app/TaskFlow/frmMain.vb
@@ -604,7 +604,7 @@ Public Class frmMain
 
     End Function
 
-    Private Function GetXML_LayoutName()
+    Private Function GetLayoutName_GridMain()
         Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}_{1}.xml", GRID_LOAD_TYPE, USER_LANGUAGE)
         Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
     End Function
@@ -616,11 +616,11 @@ Public Class frmMain
         End If
 
         Try
-            Dim xml As String = GetXML_LayoutName()
+            Dim xml As String = GetLayoutName_GridMain()
             GridView_Docs.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
         Catch ex As Exception
             LOGGER.Error(ex)
-            LOGGER.Info("Error while saving GridLayout: " & ex.Message)
+            LOGGER.Info("Error while saving GridLayout MainGrid: " & ex.Message)
         End Try
     End Sub
 
@@ -630,17 +630,17 @@ Public Class frmMain
         End If
 
         Try
-            Dim oXml As String = GetXML_LayoutName()
+            Dim oXml As String = GetLayoutName_GridMain()
             GridView_Docs.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
         Catch ex As Exception
-            LOGGER.Info("Error while restoring layout: " & ex.Message)
+            LOGGER.Info("Error while restoring layout MainGrid: " & ex.Message)
         End Try
     End Sub
 
     Private Sub ResetLayout()
         Try
             Timer_Inactivity_Reset_Disable("ResetLayout")
-            Dim xml As String = GetXML_LayoutName()
+            Dim xml As String = GetLayoutName_GridMain()
             IO.File.Delete(xml)
             Try
                 GridView_Docs.Columns.Clear()
@@ -1192,7 +1192,7 @@ Public Class frmMain
     Private Function Column_inGridViewLayout(Col2bChecked As String) As Boolean
         Try
             Dim oGridView As New GridView
-            Dim oXml As String = GetXML_LayoutName()
+            Dim oXml As String = GetLayoutName_GridMain()
             oGridView.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
             Dim oViewColumn_exists As Boolean = False
             For Each oActGridColumn As GridColumn In oGridView.Columns
@@ -2326,7 +2326,7 @@ Public Class frmMain
     Sub GetBaseData(pMode As String)
         Dim oStopWatch As New RefreshHelper.SW("GetBaseData")
         Try
-            Dim oSQL = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
+            Dim oSQL = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
             Dim DT_CHECKUSER_MODULE As DataTable
             DT_CHECKUSER_MODULE = DatabaseFallback.GetDatatable("TBDD_USER_MODULE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
                                 .FilterExpression = $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'"
diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb
index b63ce93..e87aa7b 100644
--- a/app/TaskFlow/frmValidator.vb
+++ b/app/TaskFlow/frmValidator.vb
@@ -3136,9 +3136,7 @@ Public Class frmValidator
                     oControName = oControl.Name
                     Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE")
 
-                    If oSourceIndexName = "Netto" Then
-                        Console.WriteLine("Bing Netto")
-                    End If
+
 
                     LOGGER.Debug("INDEX: " & oSourceIndexName & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & oLoadIndex.ToString)
                     Select Case oType