More minor spacing tweaks

Not interested in making any major changes yet... it's late...