Return to consistently to the grading page after annotation

 This was not working in situations where the user had navigated onto the grading page via the next/save and next/previous
 buttons, before starting the annotation.