Changes to page splitting as per review comments.