Add Feride to team and simplify team list
Improve team design