A little more UI cleanup, added the grades into the appropriate table