fixed a whole lot of issues in team page and different views