Add tooltips and numbers
Format numbers