Improved generic page layout