Improved page layout