Menu options refactoring