More work on delete button and its effects.