Improve team settings