Add delete button to all forms, closes #1492