Changed checkboxes & radio buttons markup