Legend menu improvements