[ task #877 ] Reorganize menus. Works with auguria menu