Small cleanup
Add command line version of Menu for compatibility