Markers now only load when added
a few more tweaks to display