Halfway through menu refactoring