Improved Payment window