Issue #17: renamed MenuHandler