Map changed to api from iframe, minor tweaks