Tweaks to team page
Moved logic around