Added angular, improved js generation