Added ComboBox element and refactored