Athletics Team Page Fixes
Merge branch 'Aug-23-1116'