Finalized page flow and payment completeion

Also fixed a number of defects raised by the client (my wife).