ARG-18: Webapp, minor changes related to AngularJS