Fixed a couple of minor issues related to legend navigation.