1. Modify the layout
2. Sort the group team by position
3. fix bug