FLEX-34605 make spacing /layout consistent