TeamsController refactor

[fd4d5d68c792ac85c9a85ee732ae41d9afca9703]
Simplified name displaying

[c6a5fa6dd9bf87c94bc2467a56a62b1a0bc5071c]