Fixed loading pages, back to the version before we started moving out to FileManager, as that work was half finished.