Fixed grid issues