Updates to maps and graphs

Mainly fixes for legend titles