Major cleanup of grid, gutters and such