Some fixes
Merge pull request #89 from BuracayBeach/team_UI

Some fixes