Improve count dialog
Use grading
Improve grading