Editing AND adding comments are reviewer

Hello all, I'm a collaborator on a course, and I'd like to make some edits on it, as well as add comments. Is there an option that combines both? I've been toggling between "collaborator" and "reviewer" mode but that takes extra time. 

Thank you,

Anya