diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb
index ae6e5f2..d579330 100644
--- a/app/TaskFlow/frmMain.vb
+++ b/app/TaskFlow/frmMain.vb
@@ -2056,8 +2056,10 @@ Public Class frmMain
                 'End If
                 If pNavbarClick = False Then
                     If pForceReload = True And (GridLayoutChanged() = True Or oColNotPartofLayout = True) Then
-                        ResetLayout()
-                        SaveGridLayout()
+                        'ResetLayout()
+                        'SaveGridLayout()
+                        LOGGER.Debug("Now GridLayout_Reset..")
+                        Await GridLayout_Reset(False)
                     Else
                         If oColNotPartofLayout = False Then
                             RestoreLayout()
@@ -2069,8 +2071,11 @@ Public Class frmMain
 
 
                 Try
-                    Create_GroupBy_Parts()
-                    COLUMNS_INVISIBLE()
+                    If pForceReload = True And (GridLayoutChanged() = True Or oColNotPartofLayout = True) Then
+                        Create_GroupBy_Parts()
+                        COLUMNS_INVISIBLE()
+                    End If
+
 
 
 
@@ -2086,18 +2091,7 @@ Public Class frmMain
 
                     End If
 
-                    'If IDB_ACTIVE = True Then
-                    '    Try
-                    '        GridViewWorkflows.Columns.Item("CONVERSATION").MaxWidth = 24
-                    '        GridViewWorkflows.Columns.Item("CONVERSATION").MinWidth = 24
-                    '        GridViewWorkflows.Columns.Item("CONVERSATION").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left
-                    '    Catch ex As Exception
-                    '        LOGGER.Info("LoadGridOverview - Column CONVERSATION obviously not part of GridViewWorkflows")
-                    '    End Try
-                    'End If
 
-
-                    'GridViewWorkflows.OptionsView.ShowIndicator = False
                     LOGGER.Debug("GridViewWorkflows.Columns loaded...")
                     Try
                         Dim oReducedColName = LAST_EDITED_COLUMN.Replace("[", "")
@@ -2154,11 +2148,14 @@ Public Class frmMain
         End If
     End Sub
 
-    Private Async Function GridLayout_Reset() As Tasks.Task
+    Private Async Function GridLayout_Reset(Also_decideload As Boolean) As Tasks.Task
 
         FRONTEND_ACTION = "RESET_LAYOUT"
         Await Reset_GridLayout(False)
-        Await Decide_Load(False, True)
+        If Also_decideload Then
+            Await Decide_Load(False, True)
+        End If
+
         GridViewWorkflows.OptionsView.ShowViewCaption = False
         SaveGridLayout()
         If GridViewWorkflows.GroupCount = 0 And Not IsNothing(GridViewWorkflows.Columns("GROUP_TEXT")) Then
@@ -2766,7 +2763,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_
             LoadNavBar()
             If oUserLanguage <> onewUserLanguage Then
                 MsgBox($"Layout will be reset as language changed from {oUserLanguage} to {onewUserLanguage}", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
-                Await GridLayout_Reset()
+                Await GridLayout_Reset(True)
             Else
                 Await Decide_Load(False)
             End If
@@ -3275,7 +3272,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_
 
     Private Async Sub BarButtonItem3_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemResetLayout.ItemClick
         LOGGER.Info("User clicked reset layout")
-        Await GridLayout_Reset()
+        Await GridLayout_Reset(True)
     End Sub
 
     Private Sub barbtnitmsaveLogfiles_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles barbtnitmsaveLogfiles.ItemClick