Cherry-picked more menu changes