Improvements to layout.