Refactoring Menu