MenuView refactor