Add $v-space and $h-space variables instead of $margin