Fix confusion between duplicate menu items

Use wrapper class containing the String so equal strings won't compare
equal to work around it
Rename selectedItem to selectedItem