** Fixed issue #51 and related bug on other menus