Improvements to head class