fixed teams and menu