Improved the layouts