Updates to header and other layout stuff