Improved Demo app