Header design bug fix