Final touch to demo_app