These new lines with the HibachiPropertyRow look great.  In fact there should have always been a HibachiPropertyRow tag in this file in the first place.

Now that it is there, you can also move the 3 lines below into it. for taxRate & addressZone