Refactor team page