WIP fix grading view