Add more tooltips and add update button skeleton