Refactor, handle delete button translation