Improvements on demo app