Vik/peer refactor

Refactor peer grading in the same way as staff grading.