Marks and grading interface fixes