initial menu refactoring