Legend, tab and markup updates