Spacing fixes & adjustments