Improve payment select functionality