Fix layout to comply with H'98.