Changed JS framework to AngularJS