[minor] ui/ux fixes in Payment Tool