Fixed up delete button with proper listeners