fixed overflow problem non-mobile
Merge branch 'master' into veronica