Some imporvements on mobile