[OPTIM] Improved the popup for team page selection