refactored some controller actions, changed named routes