Added changes to utilize the angular.js framework