Refactor for Team Page ID's