refactor team role storage and passing between activities