Menu data update

and tweaks