Minor menu and quickswitch tweaks