Improved header presentation