Improve layout.