More improvements to demo app