GridSettings refactor again