PaymentCollection.ascx control checked in with bug fixes