Updated app - placed data in controller