Fix width measurement of headers inside fixed margins.
 # Please enter the commit message for your changes. Lines starting
Merge fix header side aligned layout.