Changed navigation numbering and integrated choropleth with scatterplot.