Images and HTML markup fixes for Address etc