Grading criteria reorg and add criteria item