Image wrapper and commas

Wrapping image in a div in case it happens not to fill the space, and
including some more CSS to guarantee that commas separate city, state,
and country.