Refactoring grid gutters (WIP)