Improve the layout