Mobile web - minor refactoring