More work on the Page Manager