fix tooltip and add delete button