Header layout bug fix