Added custom marker and icon