Updating map popups - WIP


![screen shot 2014-08-27 at 11 47 33 am](https://cloud.githubusercontent.com/assets/2283680/4057475/3e690152-2dc9-11e4-875f-c3ea347027e2.png)