Tweak and fix the spacings.