Improvements un demo app