Menu Switches simplified/re-organized
Checking emacs-version <= 23, lp:1207470

fixed