Since the team pages have been merged and a lot of handling changed, a rebase was
deemed necessary to keep things up to date