improvements to layout and performance.