Updated app to AngularJS