Partial fix to teams index. Needs a bit of work