Dropdown refactor