Fixing bad grid issues