added url change on zoom and pan for map screen, added popups for demo
fix merge conflict
minor change with popup