Header layout fixes