Incremental layout update and fixes