Aesthetic fixes
Merge branch 'develop-x-design' into develop