Fixes to full page layout code.