Fix layout inheritance