fix up label world_map and add link back to world map link
Merge branches 'wip' and 'master'