fix multiple grid issues