Add default grade
Improve count bubble