Refactor Page class to eliminate duplication in render. Moved into Single class. Various other small changes