Layout speed improvements