Merge branch 'hotfix/mobile-layout-fix' into 'develop'

Hotfix/mobile layout fix

See merge request !23
4 jobs for develop in 2 minutes and 46 seconds (queued for 2 seconds)