Team/class selection and other tweaks

Eyup