Make samples more mobile friendly

This is just a start, more work ahead ...