Fix formation and team layout