Further dev on payment wizard