Reorganize handling of areas. This gives country information a lesser prominence and allows more intelligent autozooming.