restructured menu commands, fixed map4