improved the layout