Finish the demo app

Finish the demo app