Add new margins to labels.
Merge branch 'hotfix/issue-64' into develop