Readded grid, confined scaffolding margins to grid lines