Redesign suitable for release on play store