Current Location Bug Fix + Remove Overlays