Enhance menu and image support