Tweaks ot demo app