Improve team-list