finished basic logic in team page