fixed tooltip flickering issue
fixed delete button problem