Small menu refactoring