Optimize Teambuilder
Merge pull request #105 from TheUnknownOne/design

Optimize Teambuilder