Some fine tuning for the demo app