Spacing + Styling edits