Team menu fixes