Changed remove badges yes and no buttons

As per #679 changed the buttons names to Yes and Cancel.