Added the comment and todoitem toggle boxes