revision of the menu structure, and minor edits