Updating app to use angular-js