Added ability to assign users to Team
Minor updates