Add tooltips and updated labels