More work on page breaks