[013] Updated menu handler.