diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb
index 4d08f46..4737c1c 100644
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -105,7 +105,7 @@ Public Class frmMain
             My.Settings.frmMainSize = Me.Size
             My.Settings.frmMainPosition = Me.Location
             My.Settings.Save()
-            SaveGridLayout()
+            'SaveGridLayout()
         Catch ex As Exception
             LOGGER.Error(ex)
             LOGGER.Info("Error in Save FormLayout: " & ex.Message)
@@ -1101,7 +1101,7 @@ Public Class frmMain
                 Exit Sub
             End If
             Try
-                SaveGridLayout()
+                ' SaveGridLayout()
                 'bwSync.ReportProgress(10)
                 LoadNavBar()
                 'bwSync.ReportProgress(60)
@@ -1834,7 +1834,7 @@ Public Class frmMain
                         oColNotPartofLayout = Column_inGridViewLayout("CONV_YN")
                     End If
                 End If
-                If FORCE_LAYOUT_OVERVIEW = True And GridLayoutChanged() = True Or oColNotPartofLayout = True Then
+                If FORCE_LAYOUT_OVERVIEW = True And (GridLayoutChanged() = True Or oColNotPartofLayout = True) Then
                     ResetLayout()
                     SaveGridLayout()
                 Else