Menus: Some renaming, comments, add to demo. Amend 0342a3c. (#1207)
5 files changed