Legend improvements