Improvement on team page