fix
Merge branch 'hotfix/fix_mobile_style'