ZAP-60; reordered main menu items