Minor layout improvement
Merge branch 'layout' into develop
Merge branch 'develop'