mobile optimization
Merge branch 'mobile-fixes'