Menu bug fixes, upgrade checks