patched to work with new page layout