Unbreak Teambuilder
Merge pull request #82 from TheUnknownOne/design

Unbreak Teambuilder