Pull the data rendering out into a helper.
Combine the address/address 2 fields when rendering.