Corrected a couple bugs on Menu