Fix layout editing