Refactor and fill demo pages