fix menu item order issues, fix typos