Changed label positioning"
Merge branch 'development'