Fix layout timing