Rework of menu and plugin.