Improving the layout.