Progress on team view