Mobile - last before merge

This is the last mobile commit before merging JB's design commit with
my working demo.