Update app to follow simple_app in tutorial