fixed grid issues