fixing grid issues