Thanks for fix for Yoko menu too