Upgrade to latest menu-framework