Added angular route. Refactored controllers to be responsible for more specific actions