ComboBox refactoring on SetupPage