improving the layout