Improving the layout