Layout tweaks and edits to header lines