Attempt to fix grid issues