Refactored to reduce copy and paste errors
Updated Team Picker to present name and id