new header layout, almost done