Fixed some Menu functionality