Fix layout of attributes.