Further Header Work

more work and layout stuff for the header