Feature/664 checkboxes on rows