Refine teams logic and views