Improved the layout.