Working on the demo pages