fixed marker adding, highlight, locations menu items, and all locations zoom; consolidated single marker geojson file