AJ-1573 various improvements to rubric grading ui