Fixed display issues with grades