Refactor and finish tooltips