Improved header sizing