Improving the demoapp pages content