Added markers and user location