menu refactor.