Various spacing fixes
Tweak input spacing