Make sure we only run when our menu option is clicked
Fix MENU_LABEL reference typo; fix menu ID check