Updated links and team names