Update map.js: popup + custom marker
Not completely tested yet.