more self/team view improvements