#272 Still refactoring rendering of page contents