Countries agree to overhaul WHO funding