fixed most functions and payment confirmation view