Adds wayyyyyy better spacing.
Fixes bug with horizontal and vertical spacing not being explicit
enough.