Matched chart changes that Ben made in main Map
Initial merge of popups and map.  Broke a lot of things that now need to be fixed.