some payment form UI tweaks
payment form doesnt work yet
merging