Improved language selector