revert grid-item to $gutter, keep grid-container at $spacing