Improve layout of header.