Adjustments to demo app