improvements to self/team view