Refactoring DropDownMenu - in progress