add activity and refactor routes