Finetuning the demo app