Issue #13: some more refactoring to fix regression involving name of app menu