Issue #136. Improvements of menu system.