Mobile improvements #2