Address suggestion

Let me start off by saying congrats to the Deckbox team on the new changes and for listening to the users suggestions but I noticed something while completing a trade today I would like to address.

We now have to add an address (or more, I like this feature) and select it from a drop box. My problem is I have a Canadian address and it is not formated/ displayed properly.

It should list:
Name
Address
City, Province, Postal Code*
Canada

*It currently lists it as City, Postal Code, Province.

I also believe with a United States address it should be City, State, PO Box (or whatever the 5 digits are called), but I could be wrong on this one.

Anyways just wanted to give a heads up, hopefully you guys can get this fixed.