CMS-3049 Improve Dropdown