Refactoring category combo box