More menu refactoring.