Added billing address for returning customer.
Flow and code optimizations