L10N Improvements Part 2 - UI selection