Menu tweaks, fix for Toggle Macro shortcut.