Fixes #5431 and #5475 and makes non-link menu items italicized

The UI change depends on #5431 and implementing #5475 seemed cleaner than manually creating more HTML, but I can split these up if need be.