Improve teams display
'Convert' teams