TRUNK-4359 Changing units to dropdowns