Fix the way the location popup content is built. Fixes #16.