More menu fixes.

We need to move to a unified keyboard shortcut format with Ace, it will
solve a lot of these problems.