GUI-641: Offset display of unit drop-down, and don't display "Count" as a unit.