changed addresses so that they are embeds_one on locations
added a map and fiddled with the layout