CON-620 Spacing fixes