Fixing grid issues