Fixed label layouts for better visual arrangement.
Merge branch 'feature/revise-label-layouts' into develop