Refactoring & added comboboxUI