Tidied Up Grid Overflow

WIP - Squash