Upgraded to use DropdownX widget