Layout optimizations continued.