Added in Checkboxes and submit icons