Modified front end to use angularJS