Updated feedback form with checkboxes and updated labels for the two contact questions as per #1492

Maintained backwards compatibility with old select approach.