Some fixes and improvements on payment page