Mobile V3

Fingers all crossed
Tidying