MenuUpdate+Refactor