Refactoring for new demo pages