(refactor) integrating changes to views and controllers

refactor $scope on controllers, passing all tests

saving changes

saving changes

(refactor) integrating changes to views and controllers