Class highlighting now fixed