Update to gutter calculations, grouped base styles for columns