Sort out percentage grades

Move the percentage to after the number not the letter.