more menu fixes