Header layout improved