Fix the wrapper breaking the baseline

Because of the arbitrary margins I was using, the baseline got knocked
out of alignment if I included any content above the container.

This is now fixed by using multiples of the spacing unit.