Merge pull request #329 from BuracayBeach/team_UI

Team ui