Mobile App Wizard overhaul