Cleanup; New class MenuLocation.