Added billing address and shipping address select box