Improved demo app