Current Location Marker Implementation and minors bug fixed