Improve the layout.