Refactor Team rendering. Add some new members