Layout fixes for header
Merge heads