U combo box refactor