Improved the layout