Refactor a lot of code to utilities
Optimize Teambuilder
Merge branch 'design' into gh-pages