Implement Mark's suggestions.
Standardize menu selection paths.