Fix map.json url routing and minor cleanup
Merge app.js
Fix data url