Refactor and add baseline-combobox