3832 Better markup for deletion form