improve the layout