Fixed some spacing/alignment