Addition of Custom Markers & improved functionality