Fixed a regression.
Improved the menu API.