Refactoring of the MenuItem change paradigm to incorporate Waves and
eliminate many of the direct method calls between layers