Payment has a bug but its time to prettify