Payment System fix and some JS