Improvement on team builder UI