Mobile improvements #32