fix team page, and other views