Improvements to handout headers.
Improve handout headers.