Merge "Some header layout cleanup and alignment"