Added ability to tick checkboxes