More styling fixes
More styling fixes
clean-up the segment API