doc-menus fixes