Updating map popups - WIP

![screen shot 2014-08-26 at 5 06 25 pm](https://cloud.githubusercontent.com/assets/2283680/4045480/3393c798-2d2a-11e4-80db-ef7d8bb1f808.png)