Modified layout and config for demo-web-app