Large update. Switching to AngularJS framework