+ issue #145: refactoring for the menu structure.