Added checkboxes and master checkbox toggle