Select team now saves user choice and ui tweaks