Add grades colours and fix odd display of hidden cells
A little bit of format clean up