Fixed mobile view
Merge branch 'base'