fix display of 1 word menu items
Merge branch 'WmFixes' into WmChanges