Some menu refactoring.