Fix layout and header.