Fixed spacing and control's text

Issue #416