Updated page rendering to allow for greater re-use.